From 8a34c42341a73751689960229ad32ce680a78e6e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 30 Apr 2024 21:03:04 +0200
Subject: [PATCH 1/2] Rename `app/javascript/flavours/glitch/styles/index.scss`
 to `application.scss`

This is just to reduce differences with upstream.
---
 .../flavours/glitch/styles/{index.scss => application.scss} | 6 +++---
 app/javascript/flavours/glitch/styles/contrast.scss         | 2 +-
 app/javascript/flavours/glitch/styles/mastodon-light.scss   | 2 +-
 app/javascript/skins/glitch/default/common.scss             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename app/javascript/flavours/glitch/styles/{index.scss => application.scss} (100%)

diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/application.scss
similarity index 100%
rename from app/javascript/flavours/glitch/styles/index.scss
rename to app/javascript/flavours/glitch/styles/application.scss
index 9820101fe6..6a0ed80b30 100644
--- a/app/javascript/flavours/glitch/styles/index.scss
+++ b/app/javascript/flavours/glitch/styles/application.scss
@@ -8,20 +8,20 @@
 @import 'branding';
 @import 'containers';
 @import 'lists';
-@import 'modal';
 @import 'widgets';
 @import 'forms';
 @import 'accounts';
 @import 'statuses';
 @import 'components';
 @import 'polls';
+@import 'modal';
 @import 'emoji_picker';
 @import 'about';
 @import 'tables';
 @import 'admin';
-@import 'accessibility';
-@import 'rtl';
 @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/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';

From d6048d3a6cb746d8dce57c3f0bf36c85975cd27f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 30 Apr 2024 21:27:04 +0200
Subject: [PATCH 2/2] Add compatibility
 `app/javascript/flavours/glitch/styles/index.scss`

---
 app/javascript/flavours/glitch/styles/index.scss | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 app/javascript/flavours/glitch/styles/index.scss

diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/index.scss
new file mode 100644
index 0000000000..9475b4c3c8
--- /dev/null
+++ b/app/javascript/flavours/glitch/styles/index.scss
@@ -0,0 +1,5 @@
+/* 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 'application';