rewrite topbar in titlebar + fix lyrics container(?)

Comfy-Themes · Jun 1, 2024 · 0e8e57e · 0e8e57e
1 parent c87aa0a
commit 0e8e57e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 31 deletions.
diff --git a/Comfy/assets/_main.scss b/Comfy/assets/_main.scss
@@ -87,7 +87,7 @@
 	.main-view-container {
 
 		// Main Page Tweaks
-		main {
+		main:not(:has(.lyrics-lyricsContainer-LyricsContainer)) {
 			position: sticky;
 
 			.os-host-overflow,
@@ -214,12 +214,9 @@
 		}
 
 		.lyrics-lyricsContainer-LyricsContainer {
-			height: calc(100vh - max(var(--comfy-topbar-height, 40px), 8px) - 100px);
-			margin-top: -64px;
-
 			&::-webkit-scrollbar {
-				width: 0;
-				height: 0;
+				width: 0 !important;
+				height: 0 !important;
 			}
 
 			.lyrics-lyricsContainer-LyricsBackground {

diff --git a/Comfy/assets/_snippets.scss b/Comfy/assets/_snippets.scss
@@ -17,6 +17,10 @@
 		}
 	}
 
+	&.spotify__container--is-desktop:not(.fullscreen):has(#main.Topbar-Inside-Titlebar-Snippet) .body-drag-top {
+		height: calc(var(--comfy-topbar-height, 40px) + 8px) !important;
+	}
+
 	&:has(#main.Flatten-Colors-normal) {
 		--spice-main: var(--spice-sidebar);
 		--spice-main-transition: var(--spice-sidebar);
@@ -380,44 +384,31 @@
 				height: 48px;
 			}
 
-			// 1.2.37 forward, idk this code sucks lol
-			.main-view-container > [data-overlayscrollbars-initialize] > [data-overlayscrollbars-viewport] {
-				padding-top: calc(64px - var(--comfy-topbar-height, 45px) / 3);
-			}
-
-			.main-view-container__scroll-node-child-spacer {
-				height: 15px;
-			}
-
-			.playlist-playlist-playlist,
-			.profile-userOverview-container,
-			.artist-artistOverview-overview,
-			.album-albumPage-sectionWrapper,
-			.show-showPage-sectionWrapper,
-			.A4dupilHPIEDfhXDE0m0,
-			.uCHqQ74vvHOnctGg0X0B,
-			.lXcKpCtaEeFf1HifX139,
-			.MlK79hskRbFrN2OBjMkl,
-			.dpN5ViPOceUWNB5EQPHN,
-			.mmCZ5VczybT9VqKB5wFU {
-				margin-top: -15px !important;
-			}
-
+			main,
 			.queue-queuePage-queuePage,
 			.search-searchCategory-SearchCategory,
 			.artist-artistDiscography-topBar,
 			.marketplace-header,
 			.f59DF4qQ_FphIrVeRYkI,
 			.main-trackList-trackListHeader,
 			.cj6vRk3nFAi80HSVqX91 {
-				margin-top: 0 !important;
+				margin-top: -64px !important;
 				top: 0 !important;
 			}
 
 			.marketplace-header,
 			.f59DF4qQ_FphIrVeRYkI,
 			.cj6vRk3nFAi80HSVqX91 {
-				padding-top: 8px !important;
+				padding-top: 15px !important;
+			}
+
+			main:not(:has(.cj6vRk3nFAi80HSVqX91))>section:first-of-type {
+				margin-top: 15px;
+			}
+
+			.main-view-container .search-searchCategory-SearchCategory {
+				height: 64px;
+				padding-top: 17px;
 			}
 		}