about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-10-18 11:52:34 -0500
committerDavid Yip <yipdw@member.fsf.org>2017-10-18 11:52:34 -0500
commit86cf4468afe3f75b5017fb5b90f2b25e93b895c4 (patch)
tree3918f0b914531ebb14619e0759a99061983f5393
parent42e8c8eb0e9964d157ac160b3f816e58a771f045 (diff)
Update stylesheet imports in glitch components.
Commit 6e5471947438fc5883e72b8184663564ffadee28 moved the Mastodon
variables and mixins deeper in the directory hierarchy; this commit
brings the glitch components in line with that change.
-rw-r--r--app/javascript/glitch/components/local_settings/navigation/item/style.scss2
-rw-r--r--app/javascript/glitch/components/local_settings/navigation/style.scss2
-rw-r--r--app/javascript/glitch/components/local_settings/page/item/style.scss2
-rw-r--r--app/javascript/glitch/components/local_settings/page/style.scss2
-rw-r--r--app/javascript/glitch/components/local_settings/style.scss2
5 files changed, 5 insertions, 5 deletions
diff --git a/app/javascript/glitch/components/local_settings/navigation/item/style.scss b/app/javascript/glitch/components/local_settings/navigation/item/style.scss
index 33d7d3744..7f7371993 100644
--- a/app/javascript/glitch/components/local_settings/navigation/item/style.scss
+++ b/app/javascript/glitch/components/local_settings/navigation/item/style.scss
@@ -1,4 +1,4 @@
-@import 'styles/variables';
+@import 'styles/mastodon/variables';
 
 .glitch.local-settings__navigation__item {
   display: block;
diff --git a/app/javascript/glitch/components/local_settings/navigation/style.scss b/app/javascript/glitch/components/local_settings/navigation/style.scss
index a610a1212..0336f943b 100644
--- a/app/javascript/glitch/components/local_settings/navigation/style.scss
+++ b/app/javascript/glitch/components/local_settings/navigation/style.scss
@@ -1,4 +1,4 @@
-@import 'styles/variables';
+@import 'styles/mastodon/variables';
 
 .glitch.local-settings__navigation {
   background: $primary-text-color;
diff --git a/app/javascript/glitch/components/local_settings/page/item/style.scss b/app/javascript/glitch/components/local_settings/page/item/style.scss
index da1941b99..b2d8f7185 100644
--- a/app/javascript/glitch/components/local_settings/page/item/style.scss
+++ b/app/javascript/glitch/components/local_settings/page/item/style.scss
@@ -1,4 +1,4 @@
-@import 'styles/variables';
+@import 'styles/mastodon/variables';
 
 .glitch.local-settings__page__item {
   select {
diff --git a/app/javascript/glitch/components/local_settings/page/style.scss b/app/javascript/glitch/components/local_settings/page/style.scss
index 53c95ea40..e9eedcad0 100644
--- a/app/javascript/glitch/components/local_settings/page/style.scss
+++ b/app/javascript/glitch/components/local_settings/page/style.scss
@@ -1,4 +1,4 @@
-@import 'styles/variables';
+@import 'styles/mastodon/variables';
 
 .glitch.local-settings__page {
   display: block;
diff --git a/app/javascript/glitch/components/local_settings/style.scss b/app/javascript/glitch/components/local_settings/style.scss
index 54fec47bd..765294607 100644
--- a/app/javascript/glitch/components/local_settings/style.scss
+++ b/app/javascript/glitch/components/local_settings/style.scss
@@ -1,4 +1,4 @@
-@import 'styles/variables';
+@import 'styles/mastodon/variables';
 
 .glitch.local-settings {
   position: relative;