about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/local_settings/navigation
diff options
context:
space:
mode:
authorkibigo! <marrus-sh@users.noreply.github.com>2017-12-07 13:35:37 -0800
committerkibigo! <marrus-sh@users.noreply.github.com>2017-12-07 13:36:18 -0800
commit96126a5b01cae79b4e76e68b02681e00f4622d81 (patch)
tree3148451ed86cbf6843e08496462535b72f764eaa /app/javascript/flavours/glitch/features/local_settings/navigation
parent67d625c42d35dcc01d3e9bde910e5ac88b63b979 (diff)
Packaged local_settings styles in common
Diffstat (limited to 'app/javascript/flavours/glitch/features/local_settings/navigation')
-rw-r--r--app/javascript/flavours/glitch/features/local_settings/navigation/index.js3
-rw-r--r--app/javascript/flavours/glitch/features/local_settings/navigation/item/index.js3
-rw-r--r--app/javascript/flavours/glitch/features/local_settings/navigation/item/style.scss27
-rw-r--r--app/javascript/flavours/glitch/features/local_settings/navigation/style.scss10
4 files changed, 0 insertions, 43 deletions
diff --git a/app/javascript/flavours/glitch/features/local_settings/navigation/index.js b/app/javascript/flavours/glitch/features/local_settings/navigation/index.js
index fa35e83c7..fc2167c0c 100644
--- a/app/javascript/flavours/glitch/features/local_settings/navigation/index.js
+++ b/app/javascript/flavours/glitch/features/local_settings/navigation/index.js
@@ -6,9 +6,6 @@ import { injectIntl, defineMessages } from 'react-intl';
 //  Our imports
 import LocalSettingsNavigationItem from './item';
 
-//  Stylesheet imports
-import './style.scss';
-
 //  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 const messages = defineMessages({
diff --git a/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.js b/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.js
index a352d5fb2..b67d479e7 100644
--- a/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.js
+++ b/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.js
@@ -3,9 +3,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-//  Stylesheet imports
-import './style.scss';
-
 //  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 export default class LocalSettingsPage extends React.PureComponent {
diff --git a/app/javascript/flavours/glitch/features/local_settings/navigation/item/style.scss b/app/javascript/flavours/glitch/features/local_settings/navigation/item/style.scss
deleted file mode 100644
index 7f7371993..000000000
--- a/app/javascript/flavours/glitch/features/local_settings/navigation/item/style.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@import 'styles/mastodon/variables';
-
-.glitch.local-settings__navigation__item {
-  display: block;
-  padding: 15px 20px;
-  color: inherit;
-  background: $primary-text-color;
-  border-bottom: 1px $ui-primary-color solid;
-  cursor: pointer;
-  text-decoration: none;
-  outline: none;
-  transition: background .3s;
-
-  &:hover {
-    background: $ui-secondary-color;
-  }
-
-  &.active {
-    background: $ui-highlight-color;
-    color: $primary-text-color;
-  }
-
-  &.close, &.close:hover {
-    background: $error-value-color;
-    color: $primary-text-color;
-  }
-}
diff --git a/app/javascript/flavours/glitch/features/local_settings/navigation/style.scss b/app/javascript/flavours/glitch/features/local_settings/navigation/style.scss
deleted file mode 100644
index 0336f943b..000000000
--- a/app/javascript/flavours/glitch/features/local_settings/navigation/style.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@import 'styles/mastodon/variables';
-
-.glitch.local-settings__navigation {
-  background: $primary-text-color;
-  color: $ui-base-color;
-  width: 200px;
-  font-size: 15px;
-  line-height: 20px;
-  overflow-y: auto;
-}