From 86cf4468afe3f75b5017fb5b90f2b25e93b895c4 Mon Sep 17 00:00:00 2001 From: David Yip Date: Wed, 18 Oct 2017 11:52:34 -0500 Subject: [PATCH] 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. --- .../glitch/components/local_settings/navigation/item/style.scss | 2 +- .../glitch/components/local_settings/navigation/style.scss | 2 +- .../glitch/components/local_settings/page/item/style.scss | 2 +- app/javascript/glitch/components/local_settings/page/style.scss | 2 +- app/javascript/glitch/components/local_settings/style.scss | 2 +- 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 33d7d37441..7f7371993a 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 a610a12121..0336f943be 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 da1941b998..b2d8f7185c 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 53c95ea402..e9eedcad03 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 54fec47bd9..765294607d 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;