satisfy eslint and jest

pull/181/head
Ondřej Hruška 2017-10-16 22:24:44 +02:00
parent 8b9ee5f16b
commit 37ff061d9b
No known key found for this signature in database
GPG Key ID: 2C5FD5035250423D
11 changed files with 16 additions and 11 deletions

View File

@ -48,7 +48,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
// Mastodon imports //
import emojify from 'mastodon/features/emoji/emoji';
import emojify from '../../../mastodon/features/emoji/emoji';
import IconButton from '../../../mastodon/components/icon_button';
import Avatar from '../../../mastodon/components/avatar';

View File

@ -2,10 +2,10 @@
import { connect } from 'react-redux';
// Mastodon imports //
import { closeModal } from 'mastodon/actions/modal';
import { closeModal } from '../../../mastodon/actions/modal';
// Our imports //
import { changeLocalSetting } from 'glitch/actions/local_settings';
import { changeLocalSetting } from '../../../glitch/actions/local_settings';
import LocalSettings from '.';
const mapStateToProps = state => ({

View File

@ -8,7 +8,7 @@ import LocalSettingsPage from './page';
import LocalSettingsNavigation from './navigation';
// Stylesheet imports
import './style';
import './style.scss';
export default class LocalSettings extends React.PureComponent {

View File

@ -7,7 +7,7 @@ import { injectIntl, defineMessages } from 'react-intl';
import LocalSettingsNavigationItem from './item';
// Stylesheet imports
import './style';
import './style.scss';
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

View File

@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';
// Stylesheet imports
import './style';
import './style.scss';
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

View File

@ -8,7 +8,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
import LocalSettingsPageItem from './item';
// Stylesheet imports
import './style';
import './style.scss';
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

View File

@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
// Stylesheet imports
import './style';
import './style.scss';
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

View File

@ -3,6 +3,7 @@
exports[`<Avatar /> Autoplay renders a animated avatar 1`] = `
<div
className="account__avatar"
data-avatar-of="@alice"
onMouseEnter={[Function]}
onMouseLeave={[Function]}
style={
@ -19,6 +20,7 @@ exports[`<Avatar /> Autoplay renders a animated avatar 1`] = `
exports[`<Avatar /> Still renders a still avatar 1`] = `
<div
className="account__avatar"
data-avatar-of="@alice"
onMouseEnter={[Function]}
onMouseLeave={[Function]}
style={

View File

@ -6,6 +6,7 @@ exports[`<AvatarOverlay renders a overlay avatar 1`] = `
>
<div
className="account__avatar-overlay-base"
data-avatar-of="@alice"
style={
Object {
"backgroundImage": "url(/static/alice.jpg)",
@ -14,6 +15,7 @@ exports[`<AvatarOverlay renders a overlay avatar 1`] = `
/>
<div
className="account__avatar-overlay-overlay"
data-avatar-of="@eve@blackhat.lair"
style={
Object {
"backgroundImage": "url(/static/eve.jpg)",

View File

@ -2,7 +2,8 @@ import loadPolyfills from '../mastodon/load_polyfills';
// import default stylesheet with variables
require('font-awesome/css/font-awesome.css');
import 'styles/application';
import '../styles/application.scss';
require.context('../images/', true);

View File

@ -1,2 +1,2 @@
import 'packs/application';
import 'themes/spin/style';
import '../../packs/application';
import './style.scss';