From 324d816c0a6fa2f9641bc68ccfe1f6709479030f Mon Sep 17 00:00:00 2001
From: Kevin Kandlbinder <kevin@kevink.dev>
Date: Sun, 7 Nov 2021 14:20:31 +0000
Subject: [PATCH] Merge SCSS mixins and variables into globals

---
 .gitignore                                  |  4 +++-
 src/{_mixins.scss => _globals.scss}         | 14 +++++++++++++-
 src/_variables.scss                         | 12 ------------
 src/components/languageSwitcher.module.scss |  3 +--
 src/components/navigation.module.scss       |  3 +--
 src/layouts/default.scss                    |  2 +-
 src/pages/donate.module.scss                |  3 +--
 src/pages/friends.module.scss               |  3 +--
 src/pages/index.module.scss                 |  3 +--
 src/pages/projects.module.scss              |  3 +--
 src/pages/social.module.scss                |  3 +--
 src/templates/blogListing.module.scss       |  3 +--
 src/templates/blogPost.module.scss          |  3 +--
 src/templates/project.module.scss           |  2 +-
 14 files changed, 27 insertions(+), 34 deletions(-)
 rename src/{_mixins.scss => _globals.scss} (89%)
 delete mode 100644 src/_variables.scss

diff --git a/.gitignore b/.gitignore
index 008b278..74bcf92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,6 @@ public
 /.fab
 /fab.zip
 
-/npm-*.log
\ No newline at end of file
+/npm-*.log
+
+.eslintcache
\ No newline at end of file
diff --git a/src/_mixins.scss b/src/_globals.scss
similarity index 89%
rename from src/_mixins.scss
rename to src/_globals.scss
index 52170f9..a6dbe09 100644
--- a/src/_mixins.scss
+++ b/src/_globals.scss
@@ -1,4 +1,16 @@
-@import "./variables";
+$layoutWidth: 1200px;
+$accentColor: #e52b3e;
+$accentColorDarker: darken($accentColor, 5);
+$background: #070707;
+$lightBackground: #fff;
+$textColor: white;
+$lightTextColor: black;
+$layoutPadding: 20px;
+
+$noticeColor: rgba(#e52b3e, .15);
+
+$mainFont: "Fira Code", monospace;
+
 
 @mixin flexList {
     display: flex;
diff --git a/src/_variables.scss b/src/_variables.scss
deleted file mode 100644
index f6a4610..0000000
--- a/src/_variables.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-$layoutWidth: 1200px;
-$accentColor: #e52b3e;
-$accentColorDarker: darken($accentColor, 5);
-$background: #070707;
-$lightBackground: #fff;
-$textColor: white;
-$lightTextColor: black;
-$layoutPadding: 20px;
-
-$noticeColor: rgba(#e52b3e, .15);
-
-$mainFont: "Fira Code", monospace;
diff --git a/src/components/languageSwitcher.module.scss b/src/components/languageSwitcher.module.scss
index c660466..14f35d4 100644
--- a/src/components/languageSwitcher.module.scss
+++ b/src/components/languageSwitcher.module.scss
@@ -1,5 +1,4 @@
-@import "../mixins";
-@import "../variables";
+@import "../globals";
 
 .languageModal {
     position: fixed;
diff --git a/src/components/navigation.module.scss b/src/components/navigation.module.scss
index aaafaaa..15f6e04 100644
--- a/src/components/navigation.module.scss
+++ b/src/components/navigation.module.scss
@@ -1,5 +1,4 @@
-@import "../variables";
-@import "../mixins";
+@import "../globals";
 
 .offscreenNav {
     position: fixed;
diff --git a/src/layouts/default.scss b/src/layouts/default.scss
index 678ee7c..27bf061 100644
--- a/src/layouts/default.scss
+++ b/src/layouts/default.scss
@@ -1,6 +1,6 @@
 @import "~@fontsource/fira-code/index.css";
 @import "~@fontsource/fira-code/700.css";
-@import "../variables";
+@import "../globals";
 
 * {
     box-sizing: border-box;
diff --git a/src/pages/donate.module.scss b/src/pages/donate.module.scss
index 97a9867..1fafaa7 100644
--- a/src/pages/donate.module.scss
+++ b/src/pages/donate.module.scss
@@ -1,5 +1,4 @@
-@import "../variables";
-@import "../mixins";
+@import "../globals";
 
 .priceAmount {
     display: flex;
diff --git a/src/pages/friends.module.scss b/src/pages/friends.module.scss
index 4ead5a5..797a945 100644
--- a/src/pages/friends.module.scss
+++ b/src/pages/friends.module.scss
@@ -1,5 +1,4 @@
-@import "../variables";
-@import "../mixins";
+@import "../globals";
 
 .friendsList {
     @include flexList;
diff --git a/src/pages/index.module.scss b/src/pages/index.module.scss
index 7cc8c16..1c437bb 100644
--- a/src/pages/index.module.scss
+++ b/src/pages/index.module.scss
@@ -1,5 +1,4 @@
-@import "../variables";
-@import "../mixins";
+@import "../globals";
 
 .heroSection {
     width: 100%;
diff --git a/src/pages/projects.module.scss b/src/pages/projects.module.scss
index 86dd1d8..3ea489f 100644
--- a/src/pages/projects.module.scss
+++ b/src/pages/projects.module.scss
@@ -1,5 +1,4 @@
-@import "../variables";
-@import "../mixins";
+@import "../globals";
 
 .projectList {
     @include flexList;
diff --git a/src/pages/social.module.scss b/src/pages/social.module.scss
index c4412b2..0173b73 100644
--- a/src/pages/social.module.scss
+++ b/src/pages/social.module.scss
@@ -1,5 +1,4 @@
-@import "../variables";
-@import "../mixins";
+@import "../globals";
 
 .socialList {
     @include flexList;
diff --git a/src/templates/blogListing.module.scss b/src/templates/blogListing.module.scss
index ebbb2bc..6cd3572 100644
--- a/src/templates/blogListing.module.scss
+++ b/src/templates/blogListing.module.scss
@@ -1,5 +1,4 @@
-@import "../variables";
-@import "../mixins";
+@import "../globals";
 
 .sectionBacklink {
     display: block;
diff --git a/src/templates/blogPost.module.scss b/src/templates/blogPost.module.scss
index d227254..9e1bcb3 100644
--- a/src/templates/blogPost.module.scss
+++ b/src/templates/blogPost.module.scss
@@ -1,5 +1,4 @@
-@import "../variables";
-@import "../mixins";
+@import "../globals";
 
 .scamboxSection {
     flex-grow: 1;
diff --git a/src/templates/project.module.scss b/src/templates/project.module.scss
index 461d335..108b554 100644
--- a/src/templates/project.module.scss
+++ b/src/templates/project.module.scss
@@ -1,4 +1,4 @@
-@import "../variables";
+@import "../globals";
 
 .projectHeader {
     > div {