forked from treehouse/mastodon
satisfy eslint and jest
parent
8b9ee5f16b
commit
37ff061d9b
|
@ -48,7 +48,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
|
|
||||||
// Mastodon imports //
|
// Mastodon imports //
|
||||||
import emojify from 'mastodon/features/emoji/emoji';
|
import emojify from '../../../mastodon/features/emoji/emoji';
|
||||||
import IconButton from '../../../mastodon/components/icon_button';
|
import IconButton from '../../../mastodon/components/icon_button';
|
||||||
import Avatar from '../../../mastodon/components/avatar';
|
import Avatar from '../../../mastodon/components/avatar';
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
|
|
||||||
// Mastodon imports //
|
// Mastodon imports //
|
||||||
import { closeModal } from 'mastodon/actions/modal';
|
import { closeModal } from '../../../mastodon/actions/modal';
|
||||||
|
|
||||||
// Our imports //
|
// Our imports //
|
||||||
import { changeLocalSetting } from 'glitch/actions/local_settings';
|
import { changeLocalSetting } from '../../../glitch/actions/local_settings';
|
||||||
import LocalSettings from '.';
|
import LocalSettings from '.';
|
||||||
|
|
||||||
const mapStateToProps = state => ({
|
const mapStateToProps = state => ({
|
||||||
|
|
|
@ -8,7 +8,7 @@ import LocalSettingsPage from './page';
|
||||||
import LocalSettingsNavigation from './navigation';
|
import LocalSettingsNavigation from './navigation';
|
||||||
|
|
||||||
// Stylesheet imports
|
// Stylesheet imports
|
||||||
import './style';
|
import './style.scss';
|
||||||
|
|
||||||
export default class LocalSettings extends React.PureComponent {
|
export default class LocalSettings extends React.PureComponent {
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ import { injectIntl, defineMessages } from 'react-intl';
|
||||||
import LocalSettingsNavigationItem from './item';
|
import LocalSettingsNavigationItem from './item';
|
||||||
|
|
||||||
// Stylesheet imports
|
// Stylesheet imports
|
||||||
import './style';
|
import './style.scss';
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
|
|
||||||
// Stylesheet imports
|
// Stylesheet imports
|
||||||
import './style';
|
import './style.scss';
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
|
||||||
import LocalSettingsPageItem from './item';
|
import LocalSettingsPageItem from './item';
|
||||||
|
|
||||||
// Stylesheet imports
|
// Stylesheet imports
|
||||||
import './style';
|
import './style.scss';
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
|
||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
|
|
||||||
// Stylesheet imports
|
// Stylesheet imports
|
||||||
import './style';
|
import './style.scss';
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
exports[`<Avatar /> Autoplay renders a animated avatar 1`] = `
|
exports[`<Avatar /> Autoplay renders a animated avatar 1`] = `
|
||||||
<div
|
<div
|
||||||
className="account__avatar"
|
className="account__avatar"
|
||||||
|
data-avatar-of="@alice"
|
||||||
onMouseEnter={[Function]}
|
onMouseEnter={[Function]}
|
||||||
onMouseLeave={[Function]}
|
onMouseLeave={[Function]}
|
||||||
style={
|
style={
|
||||||
|
@ -19,6 +20,7 @@ exports[`<Avatar /> Autoplay renders a animated avatar 1`] = `
|
||||||
exports[`<Avatar /> Still renders a still avatar 1`] = `
|
exports[`<Avatar /> Still renders a still avatar 1`] = `
|
||||||
<div
|
<div
|
||||||
className="account__avatar"
|
className="account__avatar"
|
||||||
|
data-avatar-of="@alice"
|
||||||
onMouseEnter={[Function]}
|
onMouseEnter={[Function]}
|
||||||
onMouseLeave={[Function]}
|
onMouseLeave={[Function]}
|
||||||
style={
|
style={
|
||||||
|
|
|
@ -6,6 +6,7 @@ exports[`<AvatarOverlay renders a overlay avatar 1`] = `
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className="account__avatar-overlay-base"
|
className="account__avatar-overlay-base"
|
||||||
|
data-avatar-of="@alice"
|
||||||
style={
|
style={
|
||||||
Object {
|
Object {
|
||||||
"backgroundImage": "url(/static/alice.jpg)",
|
"backgroundImage": "url(/static/alice.jpg)",
|
||||||
|
@ -14,6 +15,7 @@ exports[`<AvatarOverlay renders a overlay avatar 1`] = `
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
className="account__avatar-overlay-overlay"
|
className="account__avatar-overlay-overlay"
|
||||||
|
data-avatar-of="@eve@blackhat.lair"
|
||||||
style={
|
style={
|
||||||
Object {
|
Object {
|
||||||
"backgroundImage": "url(/static/eve.jpg)",
|
"backgroundImage": "url(/static/eve.jpg)",
|
||||||
|
|
|
@ -2,7 +2,8 @@ import loadPolyfills from '../mastodon/load_polyfills';
|
||||||
|
|
||||||
// import default stylesheet with variables
|
// import default stylesheet with variables
|
||||||
require('font-awesome/css/font-awesome.css');
|
require('font-awesome/css/font-awesome.css');
|
||||||
import 'styles/application';
|
|
||||||
|
import '../styles/application.scss';
|
||||||
|
|
||||||
require.context('../images/', true);
|
require.context('../images/', true);
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
import 'packs/application';
|
import '../../packs/application';
|
||||||
import 'themes/spin/style';
|
import './style.scss';
|
||||||
|
|
Loading…
Reference in New Issue