Update source

CapnKitten · Aug 14, 2024 · e4fb75d · e4fb75d
1 parent afd6c79
commit e4fb75d
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 39 deletions.
diff --git a/Themes/Spotify-Discord/src/_selectorPlaceholders.scss b/Themes/Spotify-Discord/src/_selectorPlaceholders.scss
@@ -4009,6 +4009,9 @@ pre {
 .playIcon_d6cb89 {
 	@extend %voiceMessagePlayIcon !optional;
 }
+.full-motion {
+	@extend %fullMotion !optional;
+}
 .mouse-mode.full-motion {
 	@extend %mouseModeFullMotion !optional;
 }
@@ -4246,13 +4249,13 @@ pre {
 .buttons_d5deea {
 	@extend %messageButtons !optional;
 }
-.wrapper_ef319f {
+.wrapper_f7e168 {
 	@extend %messageButtonWrapper !optional;
 }
-.button_ef319f {
+.button_f7e168 {
 	@extend %messageButton !optional;
 }
-.selected_ef319f {
+.selected_f7e168 {
 	@extend %messageButtonSelected !optional;
 }
 .blockquoteContainer_f8f345 {

diff --git a/Themes/Spotify-Discord/src/app/_app.scss b/Themes/Spotify-Discord/src/app/_app.scss
@@ -43,32 +43,3 @@ body,
 %layer {
     background-color: var(--app-background);
 }
-
-/* APP ELEMENTS -> FONTS */
-
-@font-face {
-	font-family: 'CircularSp';
-	font-style: normal;
-	font-weight: 400;
-	font-display: swap;
-	src: url(https://capnkitten.github.io/BetterDiscord/Themes/Spotify-Discord/files/fonts/CircularSp-Book.woff2) format('woff2');
-	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-@font-face {
-	font-family: 'CircularSp';
-	font-style: normal;
-	font-weight: 500;
-	font-display: swap;
-	src: url(https://capnkitten.github.io/BetterDiscord/Themes/Spotify-Discord/files/fonts/CircularSp-Book.woff2) format('woff2');
-	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-@font-face {
-	font-family: 'CircularSp';
-	font-style: normal;
-	font-weight: 700;
-	font-display: swap;
-	src: url(https://capnkitten.github.io/BetterDiscord/Themes/Spotify-Discord/files/fonts/CircularSp-Bold.woff2) format('woff2');
-	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
diff --git a/Themes/Spotify-Discord/src/chat/_chat.scss b/Themes/Spotify-Discord/src/chat/_chat.scss
@@ -53,6 +53,14 @@
     background-color: var(--app-background);
 }
 
+%chatHeaderBar {
+    background-color: var(--background-tinted-active);
+
+    &:after {
+        display: none;
+    }
+}
+
 /* CHAT AREA -> DIVIDERS */
 
 %divider {
@@ -97,12 +105,12 @@
 /* CHAT AREA -> JUMP TO PRESENT BUTTON */
 
 %jumpToPresentBar {
-    margin-bottom: 30px;
+    margin-bottom: 8px;
     padding-bottom: 0;
     border-radius: 4px;
 
     &:active {
-        margin-bottom: 28px;
+        margin-bottom: 6px;
     }
 }
 

diff --git a/Themes/Spotify-Discord/src/general/_tooltip.scss b/Themes/Spotify-Discord/src/general/_tooltip.scss
@@ -19,6 +19,14 @@
 	}
 }
 
+/* TOOLTIP -> REACTIONS */
+
+%reactionTooltip {
+    background-color: var(--popout-color);
+    border-radius: var(--popout-radius);
+    box-shadow: var(--default-shadow);
+}
+
 /* TOOLTIP -> UPSELLS */
 
 %upsellTooltipWrapper {

diff --git a/Themes/Spotify-Discord/src/messages/_attachment.scss b/Themes/Spotify-Discord/src/messages/_attachment.scss
@@ -48,6 +48,11 @@
     border: none;
 }
 
+%attachmentThreadContainer {
+    background-color: var(--background-tinted-active);
+    border-radius: var(--card-radius);
+}
+
 %buildOverrideWrapper {
     background-color: var(--background-tinted-active);
     border-radius: var(--card-radius);

diff --git a/Themes/Spotify-Discord/src/pages/_index.scss b/Themes/Spotify-Discord/src/pages/_index.scss
@@ -1,6 +1,7 @@
 @forward './appDirectory';
 @forward './browseChannels';
 @forward './members';
+@forward './serverDiscovery';
 @forward './serverGuide';
 @forward './serverShop';
 @forward './shop';
diff --git a/Themes/Spotify-Discord/src/pages/_serverDiscovery.scss b/Themes/Spotify-Discord/src/pages/_serverDiscovery.scss
@@ -1,19 +1,64 @@
-@use '../mixins' as *;
-
 /*
  *
- *  SERVER DISCOVERY
+ *	SERVER DISCOVERY
  *
  */
 
 %pageWrapper {
-    background-color: var(--main-content-color) !important;
+    margin-bottom: calc((var(--app-bar-size) - var(--app-card-top-margin)) * -1);
+    background: var(--app-foreground);
+    border-radius: var(--app-card-radius);
+    overflow: hidden;
+}
+
+/* SERVER DISCOVERY -> SIDEBAR */
+
+%discoverSidebarContainer {
+    background: transparent !important;
+}
+
+%discoverSidebarCategoryItem {
+    %discoverCategoryItemInner {
+        border-radius: var(--menu-item-radius);
+    }
+
+    &:hover {
+        %discoverCategoryItemInner {
+            background-color: var(--background-tinted-hover);
+        }
+    }
+
+    &%discoverSidebarSelectedCategoryItem {
+        %discoverCategoryItemInner {
+            background-color: var(--background-tinted-active);
+        }
+    }
 }
 
+/* SERVER DISCOVERY -> CARDS */
+
 %discoverGuildCard {
-    @include card-format(true, true);
+    background-color: var(--card-color) !important;
+    border-radius: var(--card-radius);
+
+    &:hover {
+        background-color: var(--card-color-hover) !important;
+
+        %discoverGuildCardIcon {
+            background-color: var(--card-color-hover) !important;
+        }
+    }
 
     %discoverGuildCardIcon {
         background-color: var(--card-color) !important;
     }
 }
+
+%fullMotion {
+    %discoverGuildCard {
+        &:hover {
+            box-shadow: none;
+            transform: none;
+        }
+    }
+}