From 3d913d2bf1caabf8c721409f95edc597b55702d6 Mon Sep 17 00:00:00 2001
From: diondiondion <mail@diondiondion.com>
Date: Tue, 17 Mar 2026 18:39:21 +0100
Subject: [PATCH] [Glitch] Remove superfluous SCSS imports file

Port 11112fa9dcacf54d4c790bbb0bc302d2209b57bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/application.scss   | 28 ++++++++++++++++++-
 .../flavours/glitch/styles/common.scss        | 27 ------------------
 2 files changed, 27 insertions(+), 28 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/styles/common.scss

diff --git a/app/javascript/flavours/glitch/styles/application.scss b/app/javascript/flavours/glitch/styles/application.scss
index cc23627a15..18ad044b42 100644
--- a/app/javascript/flavours/glitch/styles/application.scss
+++ b/app/javascript/flavours/glitch/styles/application.scss
@@ -1 +1,27 @@
-@use 'common';
+@use 'mastodon/variables';
+@use 'mastodon/mixins';
+@use '@/styles/fonts/roboto';
+@use '@/styles/fonts/roboto-mono';
+
+@use 'mastodon/reset';
+@use 'mastodon/theme';
+@use 'mastodon/basics';
+@use 'mastodon/branding';
+@use 'mastodon/containers';
+@use 'mastodon/lists';
+@use 'mastodon/widgets';
+@use 'mastodon/forms';
+@use 'mastodon/accounts';
+@use 'mastodon/components';
+@use 'mastodon/polls';
+@use 'mastodon/modal';
+@use 'mastodon/emoji_picker';
+@use 'mastodon/about';
+@use 'mastodon/tables';
+@use 'mastodon/admin';
+@use 'mastodon/dashboard';
+@use 'mastodon/rtl';
+@use 'mastodon/accessibility';
+@use 'mastodon/rich_text';
+@use 'mastodon/glitch/local_settings';
+@use 'mastodon/glitch/doodle';
diff --git a/app/javascript/flavours/glitch/styles/common.scss b/app/javascript/flavours/glitch/styles/common.scss
deleted file mode 100644
index 18ad044b42..0000000000
--- a/app/javascript/flavours/glitch/styles/common.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@use 'mastodon/variables';
-@use 'mastodon/mixins';
-@use '@/styles/fonts/roboto';
-@use '@/styles/fonts/roboto-mono';
-
-@use 'mastodon/reset';
-@use 'mastodon/theme';
-@use 'mastodon/basics';
-@use 'mastodon/branding';
-@use 'mastodon/containers';
-@use 'mastodon/lists';
-@use 'mastodon/widgets';
-@use 'mastodon/forms';
-@use 'mastodon/accounts';
-@use 'mastodon/components';
-@use 'mastodon/polls';
-@use 'mastodon/modal';
-@use 'mastodon/emoji_picker';
-@use 'mastodon/about';
-@use 'mastodon/tables';
-@use 'mastodon/admin';
-@use 'mastodon/dashboard';
-@use 'mastodon/rtl';
-@use 'mastodon/accessibility';
-@use 'mastodon/rich_text';
-@use 'mastodon/glitch/local_settings';
-@use 'mastodon/glitch/doodle';