Merge pull request #130 from hugo9655/master

Bug fixes and improvements.
refact0r · Sep 14, 2024 · 7eda0ac · 7eda0ac
2 parents b4f885e + dd2c158
commit 7eda0ac
Show file tree

Hide file tree

Showing 13 changed files with 106 additions and 33 deletions.
diff --git a/flavors/midnight-amaryllis.theme.css b/flavors/midnight-amaryllis.theme.css
@@ -24,9 +24,12 @@
 	/* top left corner text */
 	--corner-text: 'Amaryllis';
 
+	/* width of messages divider */
+	--divider-thickness: 3px;
+
 	/* color of status indicators and window controls */
 	--online-indicator: #ccfca1; /* change to #23a55a for default green */
-	--dnd-indicator: #ff8692; /* change to #f13f43 for default red */
+	--dnd-indicator: #ff8692; /* change to #f23f43 for default red */
 	--idle-indicator: #ffdb93; /* change to #f0b232 for default yellow */
 	--streaming-indicator: #b3a0ff; /* change to #593695 for default purple */
 

diff --git a/flavors/midnight-biscuit.theme.css b/flavors/midnight-biscuit.theme.css
@@ -19,15 +19,18 @@
 	/* font, change to 'gg sans' for default discord font*/
 	--font: 'figtree';
 
+	/* top left corner text */
+	--corner-text: 'Biscuit';
+
+	/* width of messages divider */
+	--divider-thickness: 3px;
+
 	/* color of status indicators and window controls */
 	--online-indicator: #d0d694; /* change to #23a55a for default green */
-	--dnd-indicator: #cf223e; /* change to #f13f43 for default red */
+	--dnd-indicator: #cf223e; /* change to #f23f43 for default red */
 	--idle-indicator: #e39c45; /* change to #f0b232 for default yellow */
 	--streaming-indicator: #614f76; /* change to #593695 for default purple */
 
-	/* top left corner text */
-	--corner-text: 'Biscuit';
-
 	/* accent colors */
 	--accent-1: hsl(268, 20%, 65%); /* links */
 	--accent-2: hsl(268, 20%, 60%); /* general unread/mention elements */

diff --git a/flavors/midnight-catppuccin-frappe.theme.css b/flavors/midnight-catppuccin-frappe.theme.css
@@ -22,9 +22,12 @@
 	/* top left corner text */
 	--corner-text: 'Catppuccin';
 
+	/* width of messages divider */
+	--divider-thickness: 3px;
+
 	/* color of status indicators and window controls */
 	--online-indicator: #a6d189; /* change to #23a55a for default green */
-	--dnd-indicator: #e78284; /* change to #f13f43 for default red */
+	--dnd-indicator: #e78284; /* change to #f23f43 for default red */
 	--idle-indicator: #e5c890; /* change to #f0b232 for default yellow */
 	--streaming-indicator: #ca9ee6; /* change to #593695 for default purple */
 

diff --git a/flavors/midnight-catppuccin-macchiato.theme.css b/flavors/midnight-catppuccin-macchiato.theme.css
@@ -22,9 +22,12 @@
 	/* top left corner text */
 	--corner-text: 'Catppuccin';
 
+	/* width of messages divider */
+	--divider-thickness: 3px;
+
 	/* color of status indicators and window controls */
 	--online-indicator: #a6da95; /* change to #23a55a for default green */
-	--dnd-indicator: #ed8796; /* change to #f13f43 for default red */
+	--dnd-indicator: #ed8796; /* change to #f23f43 for default red */
 	--idle-indicator: #eed49f; /* change to #f0b232 for default yellow */
 	--streaming-indicator: #c6a0f6; /* change to #593695 for default purple */
 

diff --git a/flavors/midnight-catppuccin-mocha.theme.css b/flavors/midnight-catppuccin-mocha.theme.css
@@ -22,9 +22,12 @@
 	/* top left corner text */
 	--corner-text: 'Catppuccin';
 
+	/* width of messages divider */
+	--divider-thickness: 3px;
+
 	/* color of status indicators and window controls */
 	--online-indicator: #a6e3a1; /* change to #23a55a for default green */
-	--dnd-indicator: #f38ba8; /* change to #f13f43 for default red */
+	--dnd-indicator: #f38ba8; /* change to #f23f43 for default red */
 	--idle-indicator: #f9e2af; /* change to #f0b232 for default yellow */
 	--streaming-indicator: #cba6f7; /* change to #593695 for default purple */
 

diff --git a/flavors/midnight-night-owl.theme.css b/flavors/midnight-night-owl.theme.css
@@ -22,9 +22,12 @@
 	/* top left corner text */
 	--corner-text: 'Midnight - Night Owl';
 
+	/* width of messages divider */
+	--divider-thickness: 3px;
+
 	/* color of status indicators and window controls */
 	--online-indicator: var(--accent-2); /* change to #23a55a for default green */
-	--dnd-indicator: hsl(0, 100%, 69%); /* change to #f13f43 for default red */
+	--dnd-indicator: hsl(0, 100%, 69%); /* change to #f23f43 for default red */
 	--idle-indicator: hsl(180, 9%, 43%); /* change to #f0b232 for default yellow */
 	--streaming-indicator: hsl(260, 60%, 60%); /* change to #593695 for default purple */
 

diff --git a/flavors/midnight-nocturne.theme.css b/flavors/midnight-nocturne.theme.css
@@ -31,12 +31,15 @@ blackxfiied • refact0r      customize here */
 	/* top left corner text */
 	--corner-text: 'nocturne';
 
+	/* width of messages divider */
+	--divider-thickness: 3px;
+
 	/*
 	color of status indicators and window controls
 	note: updated to be more harsh by using discord's own branding kit colors (although unintended) -- https://discord.com/branding
 	*/
 	--online-indicator: #57f287; /* change to #23a55a for default green */
-	--dnd-indicator: #ed4245; /* change to #f13f43 for default red */
+	--dnd-indicator: #ed4245; /* change to #f23f43 for default red */
 	--idle-indicator: #fee75c; /* change to #f0b232 for default yellow */
 	--streaming-indicator: #5865f2; /* change to #593695 for default purple */
 

diff --git a/flavors/midnight-nord.theme.css b/flavors/midnight-nord.theme.css
@@ -22,9 +22,12 @@
 	/* top left corner text */
 	--corner-text: 'Nord';
 
+	/* width of messages divider */
+	--divider-thickness: 3px;
+
 	/* color of status indicators and window controls */
 	--online-indicator: #a3be8c; /* change to #23a55a for default green */
-	--dnd-indicator: #bf616a; /* change to #f13f43 for default red */
+	--dnd-indicator: #bf616a; /* change to #f23f43 for default red */
 	--idle-indicator: #ebcb8b; /* change to #f0b232 for default yellow */
 	--streaming-indicator: #b48ead; /* change to #593695 for default purple */
 

diff --git a/flavors/midnight-pichu.theme.css b/flavors/midnight-pichu.theme.css
@@ -20,16 +20,19 @@
 :root {
 	/* font, change to 'gg sans' for default discord font*/
 	--font: 'Nunito';
+
+	/* top left corner text */
+	--corner-text: 'LilyPichu';
+
+	/* width of messages divider */
+	--divider-thickness: 3px;
 
 	/* color of status indicators and window controls */
 	--online-indicator: hsl(160, 50%, 55%); /* change to #23a55a for default green */
-	--dnd-indicator: var(--accent-3); /* change to #f13f43 for default red */
+	--dnd-indicator: var(--accent-3); /* change to #f23f43 for default red */
 	--idle-indicator: hsl(50, 50%, 55%); /* change to #f0b232 for default yellow */
 	--streaming-indicator: hsl(260, 50%, 55%); /* change to #593695 for default purple */
 
-	/* top left corner text */
-	--corner-text: 'LilyPichu';
-
 	/* accent colors */
 	--accent-1: hsl(347, 50%, 65%); /* links */
 	--accent-2: hsl(347, 50%, 60%); /* general unread/mention elements */

diff --git a/flavors/midnight-rose-pine.theme.css b/flavors/midnight-rose-pine.theme.css
@@ -22,9 +22,12 @@
 	/* top left corner text */
 	--corner-text: 'Rose Pine';
 
+	/* width of messages divider */
+	--divider-thickness: 3px;
+
 	/* color of status indicators and window controls */
 	--online-indicator: hsl(189, 43%, 73%); /* change to #23a55a for default green */
-	--dnd-indicator: hsl(343, 76%, 68%); /* change to #f13f43 for default red */
+	--dnd-indicator: hsl(343, 76%, 68%); /* change to #f23f43 for default red */
 	--idle-indicator: hsl(35, 88%, 72%); /* change to #f0b232 for default yellow */
 	--streaming-indicator: hsl(267, 57%, 78%); /* change to #593695 for default purple */
 

diff --git a/flavors/midnight-spotify.theme.css b/flavors/midnight-spotify.theme.css
@@ -22,9 +22,12 @@
 	/* top left corner text */
 	--corner-text: 'Spotify';
 
+	/* width of messages divider */
+	--divider-thickness: 3px;
+
 	/* color of status indicators and window controls */
 	--online-indicator: hsl(141, 76%, 52%); /* change to #23a55a for default green */
-	--dnd-indicator: hsl(0, 76%, 52%); /* change to #f13f43 for default red */
+	--dnd-indicator: hsl(0, 76%, 52%); /* change to #f23f43 for default red */
 	--idle-indicator: hsl(40, 76%, 52%); /* change to #f0b232 for default yellow */
 	--streaming-indicator: hsl(260, 76%, 56%); /* change to #593695 for default purple */
 

diff --git a/flavors/midnight-vencord.theme.css b/flavors/midnight-vencord.theme.css
@@ -24,9 +24,12 @@
 	/* top left corner text */
 	--corner-text: 'Vencord';
 
+	/* width of messages divider */
+	--divider-thickness: 3px;
+
 	/* color of status indicators and window controls */
 	--online-indicator: #89b481; /* change to #23a55a for default green */
-	--dnd-indicator: #d3869b; /* change to #f13f43 for default red */
+	--dnd-indicator: #d3869b; /* change to #f23f43 for default red */
 	--idle-indicator: #d8a656; /* change to #f0b232 for default yellow */
 
 	/* accent colors */

diff --git a/midnight.css b/midnight.css
@@ -8,9 +8,12 @@
 	/* top left corner text */
 	--corner-text: 'Midnight';
 
+	/* width of messages divider */
+	--divider-thickness: 3px;
+
 	/* color of status indicators and window controls */
 	--online-indicator: var(--accent-2); /* change to #23a55a for default green */
-	--dnd-indicator: hsl(340, 60%, 60%); /* change to #f13f43 for default red */
+	--dnd-indicator: hsl(340, 60%, 60%); /* change to #f23f43 for default red */
 	--idle-indicator: hsl(50, 60%, 60%); /* change to #f0b232 for default yellow */
 	--streaming-indicator: hsl(260, 60%, 60%); /* change to #593695 for default purple */
 
@@ -110,6 +113,9 @@
 .uploadModal_f82cc7 .footer_f82cc7 /* upload modal footer */ {
 	background: var(--bg-4);
 }
+.sidebarContainer_a3a4ce, .container_a56260, .contentContainer_a56260 /* quests page */ {
+	background-color: var(--bg-4) !important;
+}
 .userPanelOuter_c69a7b {
 	--background-secondary-alt: var(--bg-4) !important;
 }
@@ -138,6 +144,9 @@
 .attachedBars_d0696b /* reply bar underneath */ {
 	background: none;
 }
+.contentContainer_a56260 /* quests page fix */ {
+	background: none !important;
+}
 .selected_fd6364 .header_fd6364, .clickable_fd6364 .header_fd6364:hover /* server name hover */ {
 	background: var(--message-hover);
 }
@@ -167,15 +176,27 @@ div.message_d5deea.replying_d5deea::before /* change reply message bar to neutra
 .botTagOP_a9e77f /* OP tag */ {
 	background: var(--accent-3);
 }
-.container_cebd1c.checked_cebd1c /* settings checkbuttons */ {
+
+/* settings checkbuttons */
+.container_cebd1c {
+	transition: background-color ease .3s;
+}
+.container_cebd1c path {
+	fill: var(--text-4);
+}
+.container_cebd1c.checked_cebd1c {
 	background: var(--accent-3) !important;
 }
+.container_cebd1c.checked_cebd1c path {
+	fill: var(--accent-3) !important;
+}
+.container_cebd1c > .slider_cebd1c > rect {
+	transition: fill ease .3s;
+}
+
 .mention_c10249:active /* NEW unread pill when clicked */ {
 	background: var(--accent-4);
 }
-path[fill='rgba(35, 165, 90, 1)'] {
-	fill: var(--accent-3);
-}
 path[fill='var(--white-500)'] {
 	fill: var(--text-0) !important;
 }
@@ -204,7 +225,6 @@ path[fill='var(--white-500)'] {
 .dots_ce0450 /* typing dots */,
 .lookOutlined_dd4f85.colorWhite_dd4f85 /* server banner buttons */,
 .header_dd5a33 /* server preview mode banner */,
-.categoryItem_c72b37.selectedCategoryItem_c72b37,
 .live_e17fae /* streaming live */,
 #app-mount .activeButton_b48941 /* member page pagination button */ ,
 #app-mount .tooltipBrand_b6c360 /* member page filter tooltip */,
@@ -215,6 +235,15 @@ path[fill='var(--white-500)'] {
 .theme-dark .tooltipGreen_b6c360, .theme-light .tooltipGreen_b6c360 /* tooltip text like vc latency */ {
 	color: var(--text-0);
 }
+[class*="selectedCategoryItem_"] /* selected discover page */ {
+	color: var(--text-0) !important;
+}
+[class*="selectedCategoryItem_"] path /* fix */ {
+	fill: currentColor;
+}
+.botTagVerified_a9e77f > path /* bot tag checkmark */ {
+	fill: var(--text-0);
+}
 #app-mount .button__33db6, .theme-light .button__33db6 /* notice banner button */,
 .lookOutlined_dd4f85.colorWhite_dd4f85 /* server banner buttons */ {
 	border-color: var(--text-0);
@@ -413,7 +442,8 @@ a[href="https://support.discord.com"] /* hide help */
 .resizeHandle_d1c246 /* pretend to be a margin */ {
 	width: var(--spacing);
 }
-.wrapper_d880dc.fullScreen_d880dc .callContainer_d880dc /* fullscreen vc */ {
+.wrapper_d880dc.fullScreen_d880dc .callContainer_d880dc,
+.fullScreen_d880dc + .layerContainer_cd0de5 + .layerContainer_cd0de5 .container_d1c246 /* fullscreen vc */ {
 	margin-top: var(--spacing);
 }
 .notice_be03aa /* banner notice */,
@@ -443,10 +473,17 @@ a[href="https://support.discord.com"] /* hide help */
 .notice_be03aa /* banner notice */,
 .wrapper_d880dc.minimum_d880dc, /* private call */
 .wrapper_d880dc.minimum_d880dc ~ .content_a7d72e /* chat under private call */,
-.main_d8215a /* server onboarding */ {
+.main_d8215a /* server onboarding */,
+/* discover page sidebar & wrappers */
+.sidebarContainer_a3a4ce,
+.pageWrapper_a3a4ce,
+.thin_c49869.scrollerBase_c49869 {
 	border-radius: var(--roundness-xl);
 	overflow: hidden;
 }
+.sidebar_a4d4d9 /* fix */ {
+	border-radius: 0 !important;
+}
 .container__93316 /* main chat */,
 .chatContent_a7d72e /* main chat inner */,
 .container_cbd271 /* members list */,
@@ -739,15 +776,14 @@ button.button_dd4f85 /* small buttons */,
 
 /* improve unread divider */
 .divider_c2654d {
-	border-width: 4px;
-	border-radius: 4px;
+	border-width: var(--divider-thickness);
+	border-radius: var(--divider-thickness);
 }
 .divider_c2654d .content_c2654d {
-	margin-top: -3px;
+	margin-top: calc(var(--divider-thickness) - var(--divider-thickness) * 2);
 }
 .endCap_c2654d {
-	margin-top: -1px;
-	padding-top: 2px;
+	margin-top: calc(var(--divider-thickness) / 2 - var(--divider-thickness));
 }
 /* improve highlight message left edge */
 .message_d5deea.mentioned_d5deea::before,
@@ -1102,8 +1138,9 @@ html.theme-light,
 	--scrollbar-auto-track: transparent;
 	--scrollbar-thin-thumb: var(--bg-3);
 	--scrollbar-thin-track: transparent;
-	--spoiler-hidden-background: var(--primary-700);
-	--spoiler-revealed-background: var(--primary-660);
+	--__spoiler-background-color--hidden: var(--bg-2);
+	--__spoiler-background-color--hidden--hover: var(--hover);
+	--__spoiler-background-color--revealed: var(--bg-2);
 	--status-danger: var(--red-400);
 	--status-danger-background: var(--red-400);
 	--status-danger-text: var(--text-0);