From 42ec307b7b4be2f9d42ada69e615c9564296a55a Mon Sep 17 00:00:00 2001
From: Airradda <3744856+Airradda@users.noreply.github.com>
Date: Sun, 21 Jun 2020 22:47:43 -0500
Subject: [PATCH 1/3] Added scrollbar coloring for each base theme

---
 src/renderer/themes.css | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/renderer/themes.css b/src/renderer/themes.css
index 8f39540b..19289496 100644
--- a/src/renderer/themes.css
+++ b/src/renderer/themes.css
@@ -10,6 +10,8 @@
   --link-visited-color: var(--accent-color-visited);
   --card-bg-color: #FFFFFF;
   --secondary-card-bg-color: #eeeeee;
+  --scrollbar-color: #9E9E9E;
+  --scrollbar-color-hover: #BDBDBD;
   --side-nav-color: #FFFFFF;
   --side-nav-hover-color: #e0e0e0;
   --side-nav-active-color: #757575;
@@ -32,6 +34,8 @@
   --link-visited-color: var(--accent-color-visited);
   --card-bg-color: #303030;
   --secondary-card-bg-color: rgba(0, 0, 0, 0.75);
+  --scrollbar-color: #616161;
+  --scrollbar-color-hover: #757575;
   --side-nav-color: #262626;
   --side-nav-hover-color: #212121;
   --side-nav-active-color: #303030;
@@ -53,6 +57,8 @@
     --link-visited-color: var(--accent-color-visited);
     --card-bg-color: #000000;
     --secondary-card-bg-color: rgba(0, 0, 0, 0.75);
+    --scrollbar-color: #212121;
+    --scrollbar-color-hover: #424242;
     --side-nav-color: #000000;
     --side-nav-hover-color: #212121;
     --side-nav-active-color: #303030;
@@ -453,9 +459,9 @@ a:visited {
 }
 ::-webkit-scrollbar-thumb {
   -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
-  background: var(--primary-color);
+  background: var(--scrollbar-color);
   border-radius: 10px;
 }
 ::-webkit-scrollbar-thumb:hover {
-  background: var(--primary-color-active);
+  background: var(--scrollbar-color-hover);
 }

From c025b6529189d7d60bb914d1146a03286d3010ac Mon Sep 17 00:00:00 2001
From: Airradda <3744856+Airradda@users.noreply.github.com>
Date: Sun, 21 Jun 2020 23:02:44 -0500
Subject: [PATCH 2/3] Removed weird artifacting

---
 src/renderer/themes.css | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/renderer/themes.css b/src/renderer/themes.css
index af0214f4..11db13d6 100644
--- a/src/renderer/themes.css
+++ b/src/renderer/themes.css
@@ -448,23 +448,25 @@ body {
   color: var(--primary-text-color);
   background-color: var(--bg-color);
 }
+
 a:link {
     color: var(--link-color);
 }
+
 a:visited {
     color: var(--link-visited-color);
 }
-<<<<<<< HEAD
+
 ::-webkit-scrollbar {
 	width: 10px;
 }
+
 ::-webkit-scrollbar-thumb {
   -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
   background: var(--scrollbar-color);
   border-radius: 10px;
 }
+
 ::-webkit-scrollbar-thumb:hover {
   background: var(--scrollbar-color-hover);
 }
-=======
->>>>>>> 9b9313d348ab019cb17ffb3478fe3c4c7b0292e5

From 7c5f6e959d36e97d556e0bee57d1a47214e9338e Mon Sep 17 00:00:00 2001
From: Airradda <3744856+Airradda@users.noreply.github.com>
Date: Sat, 11 Jul 2020 19:17:10 +0000
Subject: [PATCH 3/3] Apply requested changes

Also changed scrollbar border-radius to reflect new size
---
 src/renderer/themes.css | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/renderer/themes.css b/src/renderer/themes.css
index 11db13d6..60e1c87a 100644
--- a/src/renderer/themes.css
+++ b/src/renderer/themes.css
@@ -10,7 +10,7 @@
   --link-visited-color: var(--accent-color-visited);
   --card-bg-color: #FFFFFF;
   --secondary-card-bg-color: #eeeeee;
-  --scrollbar-color: #9E9E9E;
+  --scrollbar-color: #CCCCCC;
   --scrollbar-color-hover: #BDBDBD;
   --side-nav-color: #FFFFFF;
   --side-nav-hover-color: #e0e0e0;
@@ -34,7 +34,7 @@
   --link-visited-color: var(--accent-color-visited);
   --card-bg-color: #303030;
   --secondary-card-bg-color: rgba(0, 0, 0, 0.75);
-  --scrollbar-color: #616161;
+  --scrollbar-color: #414141;
   --scrollbar-color-hover: #757575;
   --side-nav-color: #262626;
   --side-nav-hover-color: #212121;
@@ -57,14 +57,14 @@
     --link-visited-color: var(--accent-color-visited);
     --card-bg-color: #000000;
     --secondary-card-bg-color: rgba(0, 0, 0, 0.75);
-    --scrollbar-color: #212121;
+    --scrollbar-color: #515151;
     --scrollbar-color-hover: #424242;
     --side-nav-color: #000000;
     --side-nav-hover-color: #212121;
     --side-nav-active-color: #303030;
     --search-bar-color: #262626;
     --instance-menu-color: var(--search-bar-color);
-	--logo-icon: url("~../../_icons/iconColorSmall.png");
+	  --logo-icon: url("~../../_icons/iconColorSmall.png");
    	--logo-text: url("~../../_icons/textColorSmall.png");
 }
 
@@ -458,13 +458,12 @@ a:visited {
 }
 
 ::-webkit-scrollbar {
-	width: 10px;
+	width: 6px;
 }
 
 ::-webkit-scrollbar-thumb {
-  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
   background: var(--scrollbar-color);
-  border-radius: 10px;
+  border-radius: 6px;
 }
 
 ::-webkit-scrollbar-thumb:hover {