Merge remote-tracking branch 'origin/better-themeing' into merging-upstream

2017-09-28 09:20:59 +02:00
parent 83bda6c1a8 f7ca205f38
commit daad07b1d5
25 changed files with 116 additions and 52 deletions
--- 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 'variables';
+@import 'styles/variables';

 .glitch.local-settings__page__item {
  select {
--- 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 'variables';
+@import 'styles/variables';

 .glitch.local-settings__page {
  display: block;