From 26a0f214518fd39cf0fa2dbbda03fa5d0b46481e Mon Sep 17 00:00:00 2001
From: f0x <f0x@cthu.lu>
Date: Sun, 28 Jul 2024 15:31:42 +0200
Subject: [PATCH] more file shuffling

---
 web/source/css/base/_license.css       | 18 ++++++++++++++++++
 web/source/css/base/_normalize.css     |  1 +
 web/source/css/components/emoji.css    |  2 +-
 web/source/css/{main.css => main.css2} |  4 ++--
 web/source/index.js                    |  3 ++-
 5 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 web/source/css/base/_license.css
 create mode 100644 web/source/css/base/_normalize.css
 rename web/source/css/{main.css => main.css2} (94%)

diff --git a/web/source/css/base/_license.css b/web/source/css/base/_license.css
new file mode 100644
index 000000000..1d64ef093
--- /dev/null
+++ b/web/source/css/base/_license.css
@@ -0,0 +1,18 @@
+/*
+	GoToSocial
+	Copyright (C) GoToSocial Authors admin@gotosocial.org
+	SPDX-License-Identifier: AGPL-3.0-or-later
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
\ No newline at end of file
diff --git a/web/source/css/base/_normalize.css b/web/source/css/base/_normalize.css
new file mode 100644
index 000000000..0c8f0bfd9
--- /dev/null
+++ b/web/source/css/base/_normalize.css
@@ -0,0 +1 @@
+@import "modern-normalize/modern-normalize.css";
\ No newline at end of file
diff --git a/web/source/css/components/emoji.css b/web/source/css/components/emoji.css
index 8050f0731..b2d7f38a7 100644
--- a/web/source/css/components/emoji.css
+++ b/web/source/css/components/emoji.css
@@ -1,4 +1,4 @@
-// Style emoji to fit in-line with text
+/* Style emoji to fit in-line with text */
 .emoji {
 	width: 1.45em;
 	height: 1.45em;
diff --git a/web/source/css/main.css b/web/source/css/main.css2
similarity index 94%
rename from web/source/css/main.css
rename to web/source/css/main.css2
index 7090d4881..4cfcd33d1 100644
--- a/web/source/css/main.css
+++ b/web/source/css/main.css2
@@ -19,7 +19,7 @@
 
 @import "modern-normalize/modern-normalize.css"; /* needs to be the first import */
 
-@import "./base/fonts.css";
+/* @import "./base/fonts.css";
 @import "./base/main.css";
 
 @import "./components/account-card.css";
@@ -28,4 +28,4 @@
 @import "./components/lists.css";
 @import "./components/utility.css";
 
-@import "./vendor/prism.css";
\ No newline at end of file
+@import "./vendor/prism.css"; */
\ No newline at end of file
diff --git a/web/source/index.js b/web/source/index.js
index 2d1aacd4f..034916b72 100644
--- a/web/source/index.js
+++ b/web/source/index.js
@@ -22,6 +22,7 @@ const path = require("path");
 const { globSync } = require("glob");
 
 const cssDir = path.join(__dirname, "./css");
+const cssFiles = globSync(cssDir + "/**/*.css", { ignore: cssDir + "/themes/**" });
 const cssThemes = globSync(cssDir + "/themes/**/*.css");
 
 const prodCfg = {
@@ -95,7 +96,7 @@ skulk({
 			}]]
 		},
 		css: {
-			entryFiles: cssDir + "/main.css",
+			entryFiles: cssFiles,
 			outputFile: "_discard",
 			presets: [["postcss", {
 				output: "style.css"