diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-18 11:21:04 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-18 11:28:52 -0700 |
| commit | 0a678cf377c6dd91c439fa91f75782e457836639 (patch) | |
| tree | 08db38a3fc25ce4896b26cc51ea89637bb53802c /app/javascript/glitch | |
| parent | 7a77f7b3bbafff6b8c9899e1c4404ab5e5cde853 (diff) | |
Fix for stylesheet split
Diffstat (limited to 'app/javascript/glitch')
| -rw-r--r-- | app/javascript/glitch/components/settings/index.js | 9 | ||||
| -rw-r--r-- | app/javascript/glitch/components/settings/style.scss (renamed from app/javascript/glitch/components/settings/stylesheet.scss) | 0 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/javascript/glitch/components/settings/index.js b/app/javascript/glitch/components/settings/index.js index 04c05704e..ab2e0fb87 100644 --- a/app/javascript/glitch/components/settings/index.js +++ b/app/javascript/glitch/components/settings/index.js @@ -1,14 +1,15 @@ -// Package imports // +// Package imports import React from 'react'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { injectIntl, defineMessages, FormattedMessage } from 'react-intl'; -import './stylesheet'; - -// Our imports // +// Our imports import SettingsItem from './item'; +// Stylesheet imports +import './style'; + const messages = defineMessages({ layout_auto: { id: 'layout.auto', defaultMessage: 'Auto' }, layout_desktop: { id: 'layout.desktop', defaultMessage: 'Desktop' }, diff --git a/app/javascript/glitch/components/settings/stylesheet.scss b/app/javascript/glitch/components/settings/style.scss index 48cc37984..48cc37984 100644 --- a/app/javascript/glitch/components/settings/stylesheet.scss +++ b/app/javascript/glitch/components/settings/style.scss |