diff --git a/app/javascript/flavours/glitch/styles/application.scss b/app/javascript/flavours/glitch/styles/application.scss new file mode 100644 index 0000000000..6a0ed80b30 --- /dev/null +++ b/app/javascript/flavours/glitch/styles/application.scss @@ -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'; diff --git a/app/javascript/flavours/glitch/styles/contrast.scss b/app/javascript/flavours/glitch/styles/contrast.scss index 4de31db9ae..5b43aecbe7 100644 --- a/app/javascript/flavours/glitch/styles/contrast.scss +++ b/app/javascript/flavours/glitch/styles/contrast.scss @@ -1,3 +1,3 @@ @import 'contrast/variables'; -@import 'index'; +@import 'application'; @import 'contrast/diff'; diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/index.scss index 9820101fe6..9475b4c3c8 100644 --- a/app/javascript/flavours/glitch/styles/index.scss +++ b/app/javascript/flavours/glitch/styles/index.scss @@ -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'; diff --git a/app/javascript/flavours/glitch/styles/mastodon-light.scss b/app/javascript/flavours/glitch/styles/mastodon-light.scss index 8fc132651b..756a12d868 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-light.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-light.scss @@ -1,3 +1,3 @@ @import 'mastodon-light/variables'; -@import 'index'; +@import 'application'; @import 'mastodon-light/diff'; diff --git a/app/javascript/skins/glitch/default/common.scss b/app/javascript/skins/glitch/default/common.scss index d2f673fde8..ff0d0831e0 100644 --- a/app/javascript/skins/glitch/default/common.scss +++ b/app/javascript/skins/glitch/default/common.scss @@ -1 +1 @@ -@import 'flavours/glitch/styles/index'; +@import 'flavours/glitch/styles/application';