From 96126a5b01cae79b4e76e68b02681e00f4622d81 Mon Sep 17 00:00:00 2001 From: kibigo! Date: Thu, 7 Dec 2017 13:35:37 -0800 Subject: Packaged local_settings styles in common --- .../flavours/glitch/features/local_settings/page/index.js | 3 --- .../flavours/glitch/features/local_settings/page/item/index.js | 3 --- .../flavours/glitch/features/local_settings/page/item/style.scss | 7 ------- .../flavours/glitch/features/local_settings/page/style.scss | 9 --------- 4 files changed, 22 deletions(-) delete mode 100644 app/javascript/flavours/glitch/features/local_settings/page/item/style.scss delete mode 100644 app/javascript/flavours/glitch/features/local_settings/page/style.scss (limited to 'app/javascript/flavours/glitch/features/local_settings/page') diff --git a/app/javascript/flavours/glitch/features/local_settings/page/index.js b/app/javascript/flavours/glitch/features/local_settings/page/index.js index 498230f7b..62bf410c6 100644 --- a/app/javascript/flavours/glitch/features/local_settings/page/index.js +++ b/app/javascript/flavours/glitch/features/local_settings/page/index.js @@ -7,9 +7,6 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl'; // Our imports import LocalSettingsPageItem from './item'; -// Stylesheet imports -import './style.scss'; - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * const messages = defineMessages({ diff --git a/app/javascript/flavours/glitch/features/local_settings/page/item/index.js b/app/javascript/flavours/glitch/features/local_settings/page/item/index.js index 37e28c084..66e84dfe1 100644 --- a/app/javascript/flavours/glitch/features/local_settings/page/item/index.js +++ b/app/javascript/flavours/glitch/features/local_settings/page/item/index.js @@ -3,9 +3,6 @@ import React from 'react'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; -// Stylesheet imports -import './style.scss'; - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * export default class LocalSettingsPageItem extends React.PureComponent { diff --git a/app/javascript/flavours/glitch/features/local_settings/page/item/style.scss b/app/javascript/flavours/glitch/features/local_settings/page/item/style.scss deleted file mode 100644 index b2d8f7185..000000000 --- a/app/javascript/flavours/glitch/features/local_settings/page/item/style.scss +++ /dev/null @@ -1,7 +0,0 @@ -@import 'styles/mastodon/variables'; - -.glitch.local-settings__page__item { - select { - margin-bottom: 5px; - } -} diff --git a/app/javascript/flavours/glitch/features/local_settings/page/style.scss b/app/javascript/flavours/glitch/features/local_settings/page/style.scss deleted file mode 100644 index e9eedcad0..000000000 --- a/app/javascript/flavours/glitch/features/local_settings/page/style.scss +++ /dev/null @@ -1,9 +0,0 @@ -@import 'styles/mastodon/variables'; - -.glitch.local-settings__page { - display: block; - flex: auto; - padding: 15px 20px 15px 20px; - width: 360px; - overflow-y: auto; -} -- cgit