From c5ba466cf947ddaa163320192ae6e033c0170419 Mon Sep 17 00:00:00 2001
From: Vozer <76500838+SlippingGitty@users.noreply.github.com>
Date: Sat, 9 Jul 2022 12:50:04 -0500
Subject: [PATCH] Merged `User Settings + VC Controls` by Lucism & Domi

THE FOLLOWING CSS IS BORROWED FROM LUCISM & DOMI.
PLEASE SEE THE MESSAGE FROM THE POWERCORD SERVER HERE -
https://canary.discord.com/channels/538759280057122817/755005803303403570/982421523681923184
---
 src/_sidebars.scss | 62 +++++++++++-----------------------------------
 src/_themeing.scss | 42 +++++++++++++++++++++++--------
 src/_titlebar.scss |  2 --
 3 files changed, 46 insertions(+), 60 deletions(-)

diff --git a/src/_sidebars.scss b/src/_sidebars.scss
index 3d684ec..820dc4a 100644
--- a/src/_sidebars.scss
+++ b/src/_sidebars.scss
@@ -11,12 +11,12 @@
 
 
 /* Channel Bars */
-.scroller-WSmht3, .scroller-1ox3I2, .container-1zzFcN { 
+.sidebar-1tnWFu, .container-1zzFcN { 
     border-right: .5px solid black;
 }
 
 .theme-light {
-    .scroller-WSmht3, .scroller-1ox3I2, .container-1zzFcN { 
+    .sidebar-1tnWFu, .container-1zzFcN { 
       border-right: .5px solid rgba(186, 186, 186, 0.386);
 }
 .item-3XjbnG .selected-g-kMVV .channelName-3KPsGw, .modeSelected-3DmyhH .channelName-3KPsGw {
@@ -24,24 +24,20 @@
 }
 }
 
-/* User Settings */
-.container-YkUktl {
+/* User Settings + VC Controls -- Fix by Lucism */
+.panels-3wFtMD {
+    border-radius: 20px;
+    margin-bottom: 18px;
+    margin-right: 5px;
+    margin-left: 2px;
     background: rgba(0, 0, 0, 0.436); 
     backdrop-filter: blur(10px);
     box-shadow: 0 0 3px 1px rgba(0, 0, 0, 0.483);
     border: 1px solid rgb(78, 78, 81); 
-    border-radius: 20px;
-    margin-bottom: 18px;
-    margin-right: 5px;
-    margin-left: 0px;
 }
-    .panels-3wFtMD {
-        background-color: #00000000;
-        border-right: .5px solid black;
-    }
 
 .theme-light {
-    .container-YkUktl {
+    .panels-3wFtMD {
         background: rgba(226, 221, 225, 0.89);
         box-shadow: 0 0 3px 1px rgba(0, 0, 0, 0.146);
         border: 1px solid rgba(249, 249, 249, 0.772); 
@@ -51,20 +47,8 @@
         margin-right: 5px;
         margin-left: 2px;
     }
-        .panels-3wFtMD {
-            background-color: #00000000;
-            border-right: .5px solid rgba(186, 186, 186, 0.386);
-        }
 }
 
-.searchBar-3TnChZ {
-    border-right: .5px solid black;
-}
-.theme-light {
-.searchBar-3TnChZ {
-    border-right: .5px solid rgba(186, 186, 186, 0.386);
-}
-}
 .interactiveSelected-29CP8y {
     background: var(--accent-selected) !important; 
     backdrop-filter: blur(20px);
@@ -150,26 +134,8 @@ div[aria-label="Text (Age-Restricted)"]>svg {
     margin-right: 0px;
 }
 
-/* Spotify Plugin */
-.powercord-spotify{
-    margin-bottom: 10px;
-    .spotify-extra-controls{
-        pointer-events: initial;
-        height: 32px;
-        opacity: 1;
-    }
-    .spotify-seek{
-        margin-top: 3px !important;
-        margin-right: 10px;
-        .spotify-seek-bar{
-            height: 4px;
-            .spotify-seek-bar-progress{
-                border-radius: 5px;
-            }
-        }
-        .spotify-seek-elements{
-            height: 12px;
-            opacity: 1;
-        }
-    }
-}
+
+/* PC-Spotify */
+.fa, .fab, .fad, .fal, .far, .fas, .powercord-spotify .spotify-buttons button > div {
+    font-family: "Font Awesome 5 Pro" !important;
+}
\ No newline at end of file
diff --git a/src/_themeing.scss b/src/_themeing.scss
index 037a6fc..319fdc9 100644
--- a/src/_themeing.scss
+++ b/src/_themeing.scss
@@ -19,14 +19,14 @@
 |__/  |__/ \_______/ \_______/ \_______/|__/  |__/   \___/  
                                                            */
 
-/* Blue */
+/* Blue 
 :root {
   --accent: rgb(26, 129, 251);
   --accent-hover: rgba(26, 129, 251, 0.977);
   --accent-selected: rgb(26, 129, 251, 0.612);
   --accent-focused: rgb(26, 129, 251, 0.200);
 }
-
+*/
 
 /* Red 
 :root {
@@ -52,7 +52,7 @@
     --accent-hover: rgba(248, 74, 156, 0.977);
     --accent-selected: rgb(248, 74, 156, 0.612);
     --accent-focused: rgb(248, 74, 156, 0.200);
-  }*/
+  } */
 
 /* Hatsune 
 :root {
@@ -62,14 +62,14 @@
   --accent-focused: rgb(255, 0, 128, 0.200);
 }*/
 
-/* Nord Accents
+/* Nord Accents */
 :root {
   --accent: rgba(129, 161, 193);
   --accent-hover: rgb(67, 76, 94, 0.977);
   --accent-selected: rgb(136, 192, 208, 0.612);
   --accent-focused: rgb(143, 188, 187, 0.200);
 }
-*/
+
 
 /* Dark
 :root {
@@ -121,7 +121,7 @@
                                         |  $$$$$$/                                                  
                                          \______/*/   
 
-/* Regular Theme (surCord by Vozer) */
+/* Regular Theme (surCord by Vozer) 
 :root {
   --surCordBackground: rgb(31, 30, 30);
   --surCordBackground2: rgb(42, 40, 44);
@@ -133,7 +133,7 @@
   --surCordTitleBar: rgb(55, 53, 55);
   --surCordSearch: rgb(53, 51, 55);
   --surCordHover: rgb(65, 63, 66);
-}
+} */
 
 /* AMOLED Theme (Pitch Black by Vozer) 
 :root {
@@ -161,9 +161,9 @@
   --surCordTitleBar: rgb(10, 10, 10);
   --surCordSearch: rgb(10,10,10);
   --surCordHover: var(--accent-selected);
-}*/
+} */
 
-/* Nord Theme - (Taken from Arctic Ice Studio & Sven Greb)
+/* Nord Theme - (Taken from Arctic Ice Studio & Sven Greb) */
   :root {
     --surCordBackground: rgb(46, 52, 64);
     --surCordBackground2: rgb(59, 66, 82);
@@ -176,4 +176,26 @@
     --surCordSearch: rgb(59, 66, 82);
     --surCordHover: rgb(143, 188, 187, 0.200);
 }
-*/
+
+
+/* Dracula Theme 
+:root {
+  --surCordBackground: rgb(34, 33, 44);
+  --surCordBackground2: 	rgb(43, 37, 63);
+  --surCordTextBackground: rgb(21, 19, 32);
+  --surcordFriendsBackground: rgb(11, 10, 16);
+  --surCordFriends: rgb(34, 33, 44);
+  --surCordActiveNow: rgb(43, 37, 63 .276);
+  --surCordGuilds: rgb(43, 37, 63);
+  --surCordTitleBar: rgb(21, 19, 32);
+  --surCordSearch: rgb(21, 19, 32);
+  --surCordHover: rgb(143, 188, 187, 0.200);
+}*/
+
+/* Dracula Accent 
+:root {
+  --accent: rgb(121, 109, 165);
+  --accent-hover: rgba(121, 109, 165, 0.977);
+  --accent-selected: rgb(121, 109, 165, 0.612);
+  --accent-focused: rgb(121, 109, 165, 0.200);
+}*/
\ No newline at end of file
diff --git a/src/_titlebar.scss b/src/_titlebar.scss
index 04f64a2..f516170 100644
--- a/src/_titlebar.scss
+++ b/src/_titlebar.scss
@@ -13,7 +13,6 @@
 }
     .communityInfoVisible-3zc5_s .header-3OsQeK, .communityInfoVisible-3zc5_s .header-3OsQeK:hover, .hasBanner-2IrYih .header-3OsQeK, .hasBanner-2IrYih .header-3OsQeK:hover {
       border-bottom: .5px solid rgba(0, 0, 0, 0);
-      border-right: .5px solid black;
       background-color: transparent !important;
     }
     .communityInfoPill-2Mll66 {
@@ -33,7 +32,6 @@
     }
         .communityInfoVisible-3zc5_s .header-3OsQeK, .communityInfoVisible-3zc5_s .header-3OsQeK:hover, .hasBanner-2IrYih .header-3OsQeK, .hasBanner-2IrYih .header-3OsQeK:hover {
           border-bottom: .5px solid rgba(0, 0, 0, 0);
-          border-right: .5px solid rgba(186, 186, 186, 0.386);
           background-color: transparent !important;
         }
         .communityInfoPill-2Mll66 {