From cc83099670a7675145dfccb65a85d13e67a40b22 Mon Sep 17 00:00:00 2001
From: envoyr <hello@envoyr.com>
Date: Sun, 23 Oct 2022 19:43:27 +0200
Subject: [PATCH] remove mix-manifest.json and fix gray colors

---
 .gitignore                                    |  1 +
 templates/Froxlor/assets/mix-manifest.json    | 13 ------
 .../Froxlor/src/scss/variables/_dark.scss     | 40 ++++++++---------
 .../Froxlor/src/scss/variables/_main.scss     | 44 +++++++++----------
 4 files changed, 43 insertions(+), 55 deletions(-)
 delete mode 100644 templates/Froxlor/assets/mix-manifest.json

diff --git a/.gitignore b/.gitignore
index 1abd5e3e..1b829964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ fonts/
 templates/*
 !templates/index.html
 !templates/Froxlor/
+templates/Froxlor/assets/mix-manifest.json
 templates/Froxlor/assets/css/
 templates/Froxlor/assets/js/
 templates/Froxlor/assets/webfonts/
diff --git a/templates/Froxlor/assets/mix-manifest.json b/templates/Froxlor/assets/mix-manifest.json
deleted file mode 100644
index 4b0c5cf2..00000000
--- a/templates/Froxlor/assets/mix-manifest.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "/js/main.js": "/js/main.js",
-    "/webfonts/fa-brands-400.ttf": "/webfonts/fa-brands-400.ttf",
-    "/webfonts/fa-brands-400.woff2": "/webfonts/fa-brands-400.woff2",
-    "/webfonts/fa-regular-400.ttf": "/webfonts/fa-regular-400.ttf",
-    "/webfonts/fa-regular-400.woff2": "/webfonts/fa-regular-400.woff2",
-    "/webfonts/fa-solid-900.ttf": "/webfonts/fa-solid-900.ttf",
-    "/webfonts/fa-solid-900.woff2": "/webfonts/fa-solid-900.woff2",
-    "/webfonts/fa-v4compatibility.ttf": "/webfonts/fa-v4compatibility.ttf",
-    "/webfonts/fa-v4compatibility.woff2": "/webfonts/fa-v4compatibility.woff2",
-    "/css/dark.css": "/css/dark.css",
-    "/css/main.css": "/css/main.css"
-}
diff --git a/templates/Froxlor/src/scss/variables/_dark.scss b/templates/Froxlor/src/scss/variables/_dark.scss
index edf6c060..f0765b25 100644
--- a/templates/Froxlor/src/scss/variables/_dark.scss
+++ b/templates/Froxlor/src/scss/variables/_dark.scss
@@ -2,52 +2,52 @@
 
 // Color
 $primary: $froxlor-700;
-$secondary: $neutral-500;
+$secondary: $gray-500;
 $info: $froxlor-800;
 
 // Body
-$body-bg: $neutral-900;
-$body-color: $neutral-100;
+$body-bg: $gray-900;
+$body-color: $gray-100;
 
 // Borders
-$border-color: $neutral-900;
-$border-color-translucent: $neutral-900;
+$border-color: $gray-900;
+$border-color-translucent: $gray-900;
 
 // Link
 $link-color: $froxlor-500;
 $nav-link-color: $body-color;
 
 // List groups
-$list-group-bg: $neutral-800;
+$list-group-bg: $gray-800;
 $list-group-color: $body-color;
 
 // Navbar
-$navbar-bg: $neutral-800;
-$navbar-light-color: $neutral-200;
-$navbar-light-hover-color: $neutral-500;
-$navbar-light-active-color: $neutral-500;
+$navbar-bg: $gray-800;
+$navbar-light-color: $gray-200;
+$navbar-light-hover-color: $gray-500;
+$navbar-light-active-color: $gray-500;
 
 // Sidebar
 
 // Card
-$card-bg: $neutral-800;
-$card-border-color: $neutral-600;
+$card-bg: $gray-800;
+$card-border-color: $gray-600;
 
 // Heading
-$heading-bg: $neutral-800;
+$heading-bg: $gray-800;
 $heading-color: $body-color;
 $heading-border-color: rgba(0,0,0,0.15);
 
 // Dropdown
-$dropdown-bg: $neutral-800;
-$dropdown-color: $neutral-100;
-$dropdown-link-color: $neutral-100;
-$dropdown-link-hover-bg: $neutral-900;
+$dropdown-bg: $gray-800;
+$dropdown-color: $gray-100;
+$dropdown-link-color: $gray-100;
+$dropdown-link-hover-bg: $gray-900;
 
 // Modal
-$modal-content-bg: $neutral-800;
+$modal-content-bg: $gray-800;
 
 // Form control
-$input-bg: $neutral-900;
+$input-bg: $gray-900;
 $input-border-color: $black;
-$input-group-addon-bg: $neutral-800;
+$input-group-addon-bg: $gray-800;
diff --git a/templates/Froxlor/src/scss/variables/_main.scss b/templates/Froxlor/src/scss/variables/_main.scss
index af8bcebb..0bd42f27 100644
--- a/templates/Froxlor/src/scss/variables/_main.scss
+++ b/templates/Froxlor/src/scss/variables/_main.scss
@@ -10,36 +10,36 @@ $froxlor-700: #1a83b6;
 $froxlor-800: #1872a2;
 $froxlor-900: #0e5380;
 
-$neutral-50: #fafafa;
-$neutral-100: #f5f5f5;
-$neutral-200: #e5e5e5;
-$neutral-300: #d4d4d4;
-$neutral-400: #a3a3a3;
-$neutral-500: #737373;
-$neutral-600: #525252;
-$neutral-700: #404040;
-$neutral-800: #262626;
-$neutral-900: #171717;
-
-$dark: $neutral-800;
+// Gray
+$white:    #fff;
+$gray-100: #f8f9fa;
+$gray-200: #e9ecef;
+$gray-300: #dee2e6;
+$gray-400: #ced4da;
+$gray-500: #adb5bd;
+$gray-600: #6c757d;
+$gray-700: #495057;
+$gray-800: #343a40;
+$gray-900: #212529;
+$black:    #000;
 
 // Colors
-$light-bg: $neutral-100;
-$dark-bg: $neutral-800;
-
-$light-font-color: $neutral-800;
-$dark-font-color: $neutral-100;
-
-$black: #000000;
-$white: #ffffff;
-$light: $neutral-100;
+$light: $gray-100;
 $primary: $froxlor-800;
-$secondary: $neutral-600;
+$secondary: $gray-600;
 $info: $froxlor-900;
 $warning: #FBBF24;
 $danger: #BE123C;
 $success: #059669;
 
+// Body
+$light-bg: $gray-100;
+$dark-bg: $gray-800;
+
+// Typography
+$light-font-color: $gray-800;
+$dark-font-color: $gray-100;
+
 $alert-bg-scale: 0;
 $alert-color-scale: 0;
 $alert-border-width: 0;