From 6e301601f9c126d6b9a27e449f2d8e5d94d838be Mon Sep 17 00:00:00 2001
From: Jai A <jai.a@tuta.io>
Date: Thu, 25 Jun 2020 22:40:29 -0700
Subject: [PATCH] Fix minor styling issues

---
 Cargo.toml                       |  2 +-
 src/routes/search.rs             |  1 -
 static/css/main.css              | 26 ++++++++++++-------------
 static/css/search.css            |  8 ++++++--
 static/images/icon/forge-alt.svg | 33 +++++++++++++++++++-------------
 static/images/icon/forge.svg     | 33 +++++++++++++++++++-------------
 static/js/main.js                |  4 ++--
 templates/search.hbs             |  3 ++-
 8 files changed, 64 insertions(+), 46 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 96948e276..72d3098a3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ actix-files = "0.2.1"
 handlebars = { version = "3.0.0", features = ["dir_source"] }
 serde_json = "1.0"
 serde = {version="1.0", features=["derive"]}
-meilisearch-sdk = "0.1.3"
+meilisearch-sdk = "0.1.4"
 human_format = "1.0.3"
 reqwest = "0.10.4"
 log = "0.4.8"
diff --git a/src/routes/search.rs b/src/routes/search.rs
index aae92286b..691963e67 100644
--- a/src/routes/search.rs
+++ b/src/routes/search.rs
@@ -172,7 +172,6 @@ fn search(info: &SearchRequest) -> Vec<SearchMod> {
 TODO This method needs a lot of refactoring. Here's a list of changes that need to be made:
  - Move Curseforge Indexing to another method/module
  - Get rid of the 4 indexes (when MeiliSearch updates) and replace it with different rules
- - Cleanup this code (it's very messy)
  - Remove code fragment duplicates
  */
 
diff --git a/static/css/main.css b/static/css/main.css
index 019d82952..eaeaeb6eb 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -13,18 +13,18 @@
 	--muted: gray;
 	--forge-color: #1e2d44;
 
-	--tech-color: red;
-	--adventure-color: saddlebrown;
-	--magic-color: rebeccapurple;
-	--utility-color: orangered;
-	--decoration-color: #2f92d8;
-	--world-color: yellow;
-	--library-color: orange;
-	--cursed-color: palevioletred;
-	--misc-color: deepskyblue;
-	--storage-color: #e1a15a;
-	--food-color: royalblue;
-	--equipment-color: black;
+	--tech-color: #d01111;
+	--adventure-color: #c8a800;
+	--magic-color: #7532b8;
+	--utility-color: #e3690f;
+	--decoration-color: #14a593;
+	--world-color: #32a31f;
+	--library-color: #1363b8;
+	--cursed-color: #933151;
+	--misc-color: #323232;
+	--storage-color: #a77741;
+	--food-color: #9f1823;
+	--equipment-color: #654700;
 }
 
 [data-theme="dark"] {
@@ -130,7 +130,7 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 .site-header h2 {
-    color: --var(white-text);
+    color: var(--white-text);
     font-weight: bolder;
     padding: 0 20px 0 10px;
 }
diff --git a/static/css/search.css b/static/css/search.css
index 8cc3822a4..283577c99 100644
--- a/static/css/search.css
+++ b/static/css/search.css
@@ -294,6 +294,10 @@
     background-color: #1e2d44;
 }
 
+.forge-badge img {
+    width: 23px;
+}
+
 .fabric-badge {
     color: #585849;
     background-color: #fffdd0;
@@ -325,7 +329,7 @@
 }
 
 .world-badge {
-	color: black;
+	color: white;
 	background-color: var(--world-color);
 }
 
@@ -349,7 +353,7 @@
 }
 
 .storage-badge {
-    color: wheat;
+    color: white;
     background-color: var(--storage-color);
 }
 
diff --git a/static/images/icon/forge-alt.svg b/static/images/icon/forge-alt.svg
index 6a15d2104..c79cd6d36 100644
--- a/static/images/icon/forge-alt.svg
+++ b/static/images/icon/forge-alt.svg
@@ -1,14 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 120 66.7" style="enable-background:new 0 0 120 66.7;" xml:space="preserve">
-<style type="text/css">
-	.st1{fill:#ffffff;}
-</style>
-<g>
-	<path class="st1" d="M91.6,16.7l-37.8-1.9l46.2,0v-3.7H47.8l0,7.8v6.2c0,0.1-1.5-9.1-1.9-11.7h-4.1v6.8v6.2
-		c0,0.1-1.8-10.9-1.9-12.3c-10.4,0-27.9,0-27.9,0c1.9,1.6,12.4,10.6,19.9,14.3c3.7,1.8,8.3,1.9,12.4,2c2.1,0.1,4.2,0.2,5.8,1.8
-		c2.3,2.2,2.8,5.7,0.8,8.3c-1.9,2.6-7.3,3.2-7.3,3.2L39,49.1v6.4h10.3l0.3-6.3l8.9-6.3c-0.9,0.8-3.1,2.8-6.2,7.7
-		c-0.7,1.1-1.3,2.3-1.7,3.5c2.2-1.9,6.8-3.2,12.2-3.2c5.3,0,9.9,1.3,12.1,3.2c-0.4-1.2-1-2.4-1.7-3.5c-3.2-4.9-5.3-6.9-6.2-7.7
-		l8.9,6.3l0.3,6.3h9.6v-6.4l-4.5-5.5c0,0-6.7-0.4-8.4-3.2C67.7,32.6,74.8,20.4,91.6,16.7z"/>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="none" x="0px" y="0px" width="90px" height="46px" viewBox="0 0 90 46">
+<defs>
+	<g id="Layer0_0_MEMBER_0_FILL">
+		<path fill="#ffffff" stroke="none" d="
+M 85.8 49.1
+L 81.3 43.6
+Q 79.65 43.5 77.75 43.05 73.95 42.1 72.9 40.4 68.75 34.25 74 27 79.45 19.35 91.55 16.7
+L 53.75 14.8 100 14.8 100 11.1 47.75 11.1 47.75 25.1
+Q 47.75 25.75 45.85 13.4
+L 41.75 13.4 41.75 26.4 39.85 14.1 11.95 14.1
+Q 24.8 24.9 31.85 28.4 34.3 29.6 37.9 30.05 40 30.3 44.25 30.4 46.35 30.5 47.35 30.75 49 31.15 50.05 32.2 51.8 33.9 52.05 36.2 52.35 38.6 50.85 40.5 49.65 42.15 46.5 43.1
+L 43.55 43.7 39 49.1 39 55.5 49.25 55.5 49.55 49.2 58.5 42.9
+Q 55.65 45.3 52.25 50.6 51.3 52.1 50.55 54.1 52.25 52.65 55.45 51.8 58.75 50.9 62.75 50.9 66.65 50.9 69.95 51.8 73.2 52.65 74.9 54.1 74.3 52.35 73.2 50.6 69.8 45.4 67 42.9
+L 75.9 49.2 76.2 55.5 85.8 55.5 85.8 49.1 Z"/>
+	</g>
+</defs>
+
+<g transform="matrix( 1, 0, 0, 1, -10.95,-10.3) ">
+	<use xlink:href="#Layer0_0_MEMBER_0_FILL"/>
 </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/static/images/icon/forge.svg b/static/images/icon/forge.svg
index 4f7f0495a..147dad49e 100644
--- a/static/images/icon/forge.svg
+++ b/static/images/icon/forge.svg
@@ -1,14 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 120 66.7" style="enable-background:new 0 0 120 66.7;" xml:space="preserve">
-<style type="text/css">
-	.st1{fill:#1e2d44;}
-</style>
-<g>
-	<path class="st1" d="M91.6,16.7l-37.8-1.9l46.2,0v-3.7H47.8l0,7.8v6.2c0,0.1-1.5-9.1-1.9-11.7h-4.1v6.8v6.2
-		c0,0.1-1.8-10.9-1.9-12.3c-10.4,0-27.9,0-27.9,0c1.9,1.6,12.4,10.6,19.9,14.3c3.7,1.8,8.3,1.9,12.4,2c2.1,0.1,4.2,0.2,5.8,1.8
-		c2.3,2.2,2.8,5.7,0.8,8.3c-1.9,2.6-7.3,3.2-7.3,3.2L39,49.1v6.4h10.3l0.3-6.3l8.9-6.3c-0.9,0.8-3.1,2.8-6.2,7.7
-		c-0.7,1.1-1.3,2.3-1.7,3.5c2.2-1.9,6.8-3.2,12.2-3.2c5.3,0,9.9,1.3,12.1,3.2c-0.4-1.2-1-2.4-1.7-3.5c-3.2-4.9-5.3-6.9-6.2-7.7
-		l8.9,6.3l0.3,6.3h9.6v-6.4l-4.5-5.5c0,0-6.7-0.4-8.4-3.2C67.7,32.6,74.8,20.4,91.6,16.7z"/>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="none" x="0px" y="0px" width="90px" height="46px" viewBox="0 0 90 46">
+<defs>
+	<g id="Layer0_0_MEMBER_0_FILL">
+		<path fill="#1e2d44" stroke="none" d="
+M 85.8 49.1
+L 81.3 43.6
+Q 79.65 43.5 77.75 43.05 73.95 42.1 72.9 40.4 68.75 34.25 74 27 79.45 19.35 91.55 16.7
+L 53.75 14.8 100 14.8 100 11.1 47.75 11.1 47.75 25.1
+Q 47.75 25.75 45.85 13.4
+L 41.75 13.4 41.75 26.4 39.85 14.1 11.95 14.1
+Q 24.8 24.9 31.85 28.4 34.3 29.6 37.9 30.05 40 30.3 44.25 30.4 46.35 30.5 47.35 30.75 49 31.15 50.05 32.2 51.8 33.9 52.05 36.2 52.35 38.6 50.85 40.5 49.65 42.15 46.5 43.1
+L 43.55 43.7 39 49.1 39 55.5 49.25 55.5 49.55 49.2 58.5 42.9
+Q 55.65 45.3 52.25 50.6 51.3 52.1 50.55 54.1 52.25 52.65 55.45 51.8 58.75 50.9 62.75 50.9 66.65 50.9 69.95 51.8 73.2 52.65 74.9 54.1 74.3 52.35 73.2 50.6 69.8 45.4 67 42.9
+L 75.9 49.2 76.2 55.5 85.8 55.5 85.8 49.1 Z"/>
+	</g>
+</defs>
+
+<g transform="matrix( 1, 0, 0, 1, -10.95,-10.3) ">
+	<use xlink:href="#Layer0_0_MEMBER_0_FILL"/>
 </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/static/js/main.js b/static/js/main.js
index 4fcb33f89..452810ae2 100644
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -1,5 +1,5 @@
 window.onload = function () {
-	if (localStorage.getItem("theme")) {
-		document.documentElement.setAttribute("theme", localStorage.getItem("theme"));
+	if (localStorage.getItem("data-theme")) {
+		document.documentElement.setAttribute("data-theme", localStorage.getItem("data-theme"));
 	}
 }
\ No newline at end of file
diff --git a/templates/search.hbs b/templates/search.hbs
index b7bec52f9..c32278581 100644
--- a/templates/search.hbs
+++ b/templates/search.hbs
@@ -5,6 +5,8 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+    <script src="/static/js/main.js"></script>
+
     <link href="/static/css/main.css" rel="stylesheet" type="text/css">
     <link href="/static/css/search.css" rel="stylesheet" type="text/css">
     <link href="/static/css/normalize.css" rel="stylesheet" type="text/css">
@@ -156,7 +158,6 @@
     </div>
 </div>
 
-<script src="/static/js/main.js"></script>
 <script src="/static/js/search.js"></script>
 
 </body>