From 9ed36e2738652fdd0fe9c607a8fbbb44707026a1 Mon Sep 17 00:00:00 2001
From: Fluffy-Bean <michal-gdula@protonmail.com>
Date: Tue, 13 Sep 2022 15:03:09 +0000
Subject: [PATCH] Fix Accent Colour not being picked up

---
 css/main.css             |  3 ++-
 css/main.scss            |  2 +-
 css/scss/_body.scss      | 22 +++++++++++-----------
 css/scss/_mixin.scss     |  2 ++
 css/scss/_variables.scss | 20 +++++++++++---------
 5 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/css/main.css b/css/main.css
index d638a89..f80099f 100644
--- a/css/main.css
+++ b/css/main.css
@@ -8,7 +8,7 @@
  |-------------------------------------------------------------
 */
 :root {
-  --bg: #151515bb;
+  --bg: rgba(21, 21, 21, 0.7333333333);
   --bg-1: #242621;
   --bg-2: #1D1E1C;
   --bg-3: #151515;
@@ -19,6 +19,7 @@
   --green: #8C977D;
   --black: #151515;
   --white: #E8E3E3;
+  --accent: #8C977D;
 }
 
 /*
diff --git a/css/main.scss b/css/main.scss
index a5c1468..cf5a0ff 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -109,7 +109,7 @@ a.btn {
 }
 
 .btn-good {
-    background-color: $green;
+    background-color: $page-accent;
 }
 
 .btn-bad {
diff --git a/css/scss/_body.scss b/css/scss/_body.scss
index 40cf3e8..6533b33 100644
--- a/css/scss/_body.scss
+++ b/css/scss/_body.scss
@@ -53,7 +53,7 @@
     flex-direction: row;
     flex-wrap: wrap;
 
-    border: 0.2rem solid $green;
+    border: 0.2rem solid $page-accent;
 
     border-radius: $rad;
     box-shadow: $shadow;
@@ -239,14 +239,14 @@
 
 // DESCRIPTION
 .image-description {
-    @include defaultDecoration($green);
+    @include defaultDecoration($page-accent);
     @include defaultFont();
 }
 
 
 // DETAILS
 .image-detail {
-    @include defaultDecoration($green);
+    @include defaultDecoration($page-accent);
     @include defaultFont();
 
     &>div {
@@ -281,7 +281,7 @@
 
 // TAGS
 .tags-root {
-    @include defaultDecoration($green);
+    @include defaultDecoration($page-accent);
     @include defaultFont();
 }
 
@@ -319,7 +319,7 @@
  |-------------------------------------------------------------
 */
 .about-root {
-    @include defaultDecoration($green);
+    @include defaultDecoration($page-accent);
     @include defaultFont();
 }
 
@@ -329,7 +329,7 @@
  |-------------------------------------------------------------
 */
 .upload-root {
-    @include defaultDecoration($green);
+    @include defaultDecoration($page-accent);
     @include defaultFont();
 }
 
@@ -339,21 +339,21 @@
  |-------------------------------------------------------------
 */
 .account-root {
-    @include defaultDecoration($green);
+    @include defaultDecoration($page-accent);
     @include defaultFont();
 }
 .admin-root {
-    @include defaultDecoration($green);
+    @include defaultDecoration($page-accent);
     @include defaultFont();
 }
 .signup-root {
-    @include defaultDecoration($green);
+    @include defaultDecoration($page-accent);
     @include defaultFont();
     // By default its hidden, in place is login
     display: none;
 }
 .login-root {
-    @include defaultDecoration($green);
+    @include defaultDecoration($page-accent);
     @include defaultFont();
 }
 
@@ -373,6 +373,6 @@
  |-------------------------------------------------------------
 */
 .search-root {
-    @include defaultDecoration($green);
+    @include defaultDecoration($page-accent);
     @include defaultFont();
 }
\ No newline at end of file
diff --git a/css/scss/_mixin.scss b/css/scss/_mixin.scss
index d0ae871..793ab56 100644
--- a/css/scss/_mixin.scss
+++ b/css/scss/_mixin.scss
@@ -12,6 +12,8 @@
 
     box-shadow: $shadow;
 
+
+
     >* {
         margin-top: 0;
         margin-bottom: 0.5rem;
diff --git a/css/scss/_variables.scss b/css/scss/_variables.scss
index 0749c8f..2320ee6 100644
--- a/css/scss/_variables.scss
+++ b/css/scss/_variables.scss
@@ -25,17 +25,19 @@ sans-serif;
 
 // Fallback for items that do not yet support the new sass stylesheet system
 :root {
-  --bg: #151515bb;
+  --bg: #{$bg-alt};
   --bg-1: #242621;
   --bg-2: #1D1E1C;
-  --bg-3: #151515;
+  --bg-3: #{$bg};
 
-  --fg: #E8E3E3;
-  --fg-dark: #151515;
+  --fg: #{$fg};
+  --fg-dark: #{$fg-alt};
 
-  --red: #B66467;
-  --orange: #FF7700;
-  --green: #8C977D;
-  --black: #151515;
-  --white: #E8E3E3;
+  --red: #{$red};
+  --orange: #{$orange};
+  --green: #{$green};
+  --black: #{$black};
+  --white: #{$white};
+
+  --accent: #{$page-accent};
 }
\ No newline at end of file