From d76cba253a18964435a5e4be6104467063a58efb Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Thu, 1 Dec 2022 12:16:16 -0500
Subject: [PATCH] Compacting scss

---
 Makefile               |  5 ++++-
 sass/global.scss       | 17 +++++++++++++++++
 static/dist/.gitignore |  3 ++-
 templates/base.html    | 11 +----------
 4 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 sass/global.scss

diff --git a/Makefile b/Makefile
index 2e0b265..98ecce0 100644
--- a/Makefile
+++ b/Makefile
@@ -13,4 +13,7 @@ static/dist/line-awesome/fonts/la-brands-400.woff: node_modules/line-awesome/dis
 
 static/dist/github-markdown-css/github-markdown-light.css: node_modules/github-markdown-css/github-markdown-light.css
 	@mkdir -p $(dir $@)
-	cp $< $@
\ No newline at end of file
+	cp $< $@
+
+node_modules:
+	npm install
\ No newline at end of file
diff --git a/sass/global.scss b/sass/global.scss
new file mode 100644
index 0000000..a0c25c2
--- /dev/null
+++ b/sass/global.scss
@@ -0,0 +1,17 @@
+// This file bundles together all site styles, allowing the required stuff to load in one request
+
+// Fixes
+@import "styles/fixes/instagram";
+@import "styles/fixes/markdown";
+@import "styles/fixes/mermaid";
+@import "styles/fixes/tiktok";
+@import "styles/fixes/youtube";
+
+// Core stuff
+@import "styles/icons";
+@import "styles/layout";
+@import "styles/typography";
+@import "styles/utils";
+
+// Always-loaded components
+@import "styles/components/github-card";
\ No newline at end of file
diff --git a/static/dist/.gitignore b/static/dist/.gitignore
index 09d1b5a..4796ae0 100644
--- a/static/dist/.gitignore
+++ b/static/dist/.gitignore
@@ -1 +1,2 @@
-/line-awesome/
\ No newline at end of file
+/line-awesome/
+/github-markdown-css/
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index 1416385..c5f0db6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -41,16 +41,7 @@
 
     {# Site-wide styles #}
     <link rel="stylesheet" href="/dist/github-markdown-css/github-markdown-light.css">
-    <link rel="stylesheet" href="/styles/fixes/instagram.css">
-    <link rel="stylesheet" href="/styles/fixes/markdown.css">
-    <link rel="stylesheet" href="/styles/fixes/mermaid.css">
-    <link rel="stylesheet" href="/styles/fixes/tiktok.css">
-    <link rel="stylesheet" href="/styles/fixes/youtube.css">
-    <link rel="stylesheet" href="/styles/typography.css">
-    <link rel="stylesheet" href="/styles/utils.css">
-    <link rel="stylesheet" href="/styles/layout.css">
-    <link rel="stylesheet" href="/styles/icons.css">
-    <link rel="stylesheet" href="/styles/components/github-card.css">
+    <link rel="stylesheet" href="/global.css">
 
     {# Component styles #}
     {% block component_styles %}