diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-10-18 17:57:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 17:57:42 -0400 |
| commit | c75665127878f41af2547b12b8723963c04d305b (patch) | |
| tree | d8275432c259d0fcd1385c163d7f2472b4a8684c /app/javascript/glitch/components/local_settings/page | |
| parent | 4421f6598f5883908fb25743977306f19a0b0f0f (diff) | |
| parent | eb907a5babed83a73788b16772fb2cba6db8c2b4 (diff) | |
Merge pull request #188 from glitch-soc/merge-upstream-2-0-0
Merge with upstream v2.0.0
Diffstat (limited to 'app/javascript/glitch/components/local_settings/page')
| -rw-r--r-- | app/javascript/glitch/components/local_settings/page/item/style.scss | 2 | ||||
| -rw-r--r-- | app/javascript/glitch/components/local_settings/page/style.scss | 2 |
2 files changed, 2 insertions, 2 deletions
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; |