Merge pull request #2698 from ClearlyClaire/glitch-soc/refactor/index-application

Rename `app/javascript/flavours/glitch/styles/index.scss` to `application.scss`
2024-05-01 13:09:43 +02:00
parent 6f74ede26b d6048d3a6c
commit 3024212403
5 changed files with 34 additions and 29 deletions
@@ -0,0 +1,27 @@
+@import 'mixins';
+@import 'variables';
+@import 'styles/fonts/roboto';
+@import 'styles/fonts/roboto-mono';
+
+@import 'reset';
+@import 'basics';
+@import 'branding';
+@import 'containers';
+@import 'lists';
+@import 'widgets';
+@import 'forms';
+@import 'accounts';
+@import 'statuses';
+@import 'components';
+@import 'polls';
+@import 'modal';
+@import 'emoji_picker';
+@import 'about';
+@import 'tables';
+@import 'admin';
+@import 'dashboard';
+@import 'rtl';
+@import 'accessibility';
+@import 'rich_text';
+@import 'glitch_local_settings';
+@import 'glitch_doodle';
@@ -1,3 +1,3 @@
@import 'contrast/variables';
-@import 'index';
+@import 'application';
@import 'contrast/diff';
@@ -1,27 +1,5 @@
-@import 'mixins';
-@import 'variables';
-@import 'styles/fonts/roboto';
-@import 'styles/fonts/roboto-mono';
+/* This is a compat file so that third-party themes do not have to immediately
+  update their implementation, as the previous `index.scss` has been renamed
+  to `application.scss`. */

-@import 'reset';
-@import 'basics';
-@import 'branding';
-@import 'containers';
-@import 'lists';
-@import 'modal';
-@import 'widgets';
-@import 'forms';
-@import 'accounts';
-@import 'statuses';
-@import 'components';
-@import 'polls';
-@import 'emoji_picker';
-@import 'about';
-@import 'tables';
-@import 'admin';
-@import 'accessibility';
-@import 'rtl';
-@import 'dashboard';
-@import 'rich_text';
-@import 'glitch_local_settings';
-@import 'glitch_doodle';
+@import 'application';
@@ -1,3 +1,3 @@
@import 'mastodon-light/variables';
-@import 'index';
+@import 'application';
@import 'mastodon-light/diff';
@@ -1 +1 @@
-@import 'flavours/glitch/styles/index';
+@import 'flavours/glitch/styles/application';