Merge remote-tracking branch 'original/master'

zvyap · zvyap · commit 9f1c3fac77e1 · 2026-02-23T01:17:02.000+08:00
# Conflicts:
#	package.json
#	src/root.scss
#	src/theme/chat/_chatbox.scss
diff --git a/bun.lock b/bun.lock
diff --git a/package.json b/package.json
@@ -1,21 +1,17 @@
 {
 	"name": "frostedglass",
-	"version": "1.0.0",
-	"description": "Display your picture of choice with adjustable blur and brightness.",
-	"repository": "https://github.com/DiscordStyles/FrostedGlass.git",
-	"author": "Gibbu <Gibbu_@hotmail.com>",
 	"license": "MIT",
 	"private": false,
 	"type": "module",
 	"scripts": {
-		"dev": "bd-scss dev",
-		"build": "bd-scss build",
+		"dev": "bun --bun bd-scss dev",
+		"build": "bun --bun bd-scss build",
 		"reroll": "bd-scss reroll"
 	},
 	"dependencies": {
-		"@discordstyles/classes": "^1.0.2"
+		"@discordstyles/classes": "^1.0.6",
+		"bd-scss": "^3.0.8"
 	},
-	"packageManager": "pnpm@8.15.5+sha512.b051a32c7e695833b84926d3b29b8cca57254b589f0649d899c6e9d0edb670b91ec7e2a43459bae73759bb5ce619c3266f116bf931ce22d1ef1759a7e45aa96f",
 	"devDependencies": {
 		"bd-scss": "^3.0.5",
 		"prettier": "^3.5.3",
diff --git a/src/root.scss b/src/root.scss
@@ -1,5 +1,5 @@
 /* Old Windows titlebar - remove this @import if you wish to use default titlebar */
-// @import url('https://discordstyles.github.io/Addons/windows-titlebar.css');
+@import url('https://chloecinders.github.io/visual-refresh-compact-title-bar/desktop.css');
 
 :root {
 	/*
diff --git a/src/theme/app/_app.scss b/src/theme/app/_app.scss
@@ -25,7 +25,8 @@
 		border: none;
 	}
 
-	.container__9293f, .container__133bf {
+	.container__9293f,
+	.container__133bf {
 		border: none;
 	}
 
@@ -84,4 +85,4 @@ html.custom-theme-background #{cls('mount app.inner')}::before {
 	font-weight: 700;
 	font-size: larger;
 	z-index: 9000;
-}
+}
diff --git a/src/theme/app/_background.scss b/src/theme/app/_background.scss
@@ -29,9 +29,9 @@
 	.container__56cd1,
 	.contextMenu-HLZMGh:not(.scroller-2FKFPG),
 	.contentWrapper__08434,
-	.appAsidePanelWrapper_a3002d .layerContainer_da8173 .clickTrapContainer_da8173 #emoji-picker-tab-panel, //for the reaction picker on messages, distinct from normal emoji picker
-	.messagesPopoutWrap__45690,
-	.modal__7f8f5:not(.slide-2pHaq5),
+	.appAsidePanelWrapper_a3002d .layerContainer__59d0d .clickTrapContainer__59d0d #emoji-picker-tab-panel, //for the reaction picker on messages, distinct from normal emoji picker
+	.messagesPopoutWrap_e8b59c,
+	.modal_ab9bdf:not(.slide-2pHaq5),
 	.root-1gCeng:not(.fullscreenOnMobile-1bD22y),
 	.root-8LYsGj,
 	.subMenuContext-2n_9YM .scrollerWrap-2lJEkd,
@@ -48,7 +48,7 @@
 	.picker__09f65,
 	.container-3a5mk-,
 	.popout__86331,
-	.popout__3f413,
+	.popout_a16aea,
 	.streamPreview__6da2d,
 	.wrapper_f7ecac {
 		overflow: hidden !important;
@@ -129,3 +129,8 @@
 		}
 	}
 }
+
+// Remove discord app default background color (potentially if user want to use --background-image: transparent;)
+.app__160d8, .appMount__51fd7, body {
+    background: transparent;
+}
diff --git a/src/theme/app/_inputs.scss b/src/theme/app/_inputs.scss
@@ -76,7 +76,7 @@
 		color: rgb(255, 255, 255, 0.5);
 	}
 	// Radio buttons
-	.item__001a7 {
+	.item__88a69 {
 		border: none;
 		background: var(--background-secondary);
 		.checkbox-1ix_J3 {
@@ -95,9 +95,9 @@
 			polyline {
 				stroke: rgb(var(--gradient-primary));
 			}
-			&:has(> .radioBar__001a7[style*='--radio-bar-accent-color']) {
+			&:has(> .radioBar__88a69[style*='--radio-bar-accent-color']) {
 				background: transparent !important;
-				.radioBar__001a7 {
+				.radioBar__88a69 {
 					background: var(--radio-bar-accent-color);
 				}
 			}
@@ -134,7 +134,7 @@
 	}
 	// Select
 	[class*='css'][class*='control'],
-	.select__3f413 {
+	.select_a16aea {
 		background: var(--background-secondary);
 		border-color: transparent;
 	}
@@ -143,7 +143,7 @@
 		opacity: 1;
 	}
 	// Select Dropdown
-	.popout__3f413 {
+	.popout_a16aea {
 		backdrop-filter: blur(var(--overlay-blur, 5px));
 		background: rgb(0 0 0 / var(--overlay-brightness));
 		overflow-y: scroll !important;
diff --git a/src/theme/app/_toolbars.scss b/src/theme/app/_toolbars.scss
@@ -9,18 +9,10 @@
 	}
 }
 
-// Discords new titlebar
-#app-mount {
-	.bar_c38106 {
-		background-color: rgb(0, 0, 0, var(--serverlist-brightness));
-	}
-}
-
 // Makes the top bar more easily grabbable
 .titleBar__421ed {
 	height: 20px !important;
 	-webkit-app-region: drag;
 	pointer-events: none;
 	top: 0;
 }
-
diff --git a/src/theme/app/_tooltips.scss b/src/theme/app/_tooltips.scss
@@ -1,12 +1,12 @@
 #app-mount {
-	.tooltip__382e7 {
+	.tooltip_c36707 {
 		color: var(--text-normal);
 		text-align: center;
 		font-weight: 600;
 	}
-	.tooltipPrimary__382e7 {
+	.tooltipPrimary_c36707 {
 		background: var(--gradient);
-		.tooltipPointer__382e7 {
+		.tooltipPointer_c36707 {
 			display: none;
 		}
 	}
diff --git a/src/theme/chat/_chatbox.scss b/src/theme/chat/_chatbox.scss
@@ -43,10 +43,10 @@ div.scrollableContainer__74017.themedBackground__74017 {
             background: transparent;
         }
 
-		#{cls('chat.textbox.placeholder')},
-		#{cls('chat.textbox.slate')} {
-			padding-left: 5px;
-		}
+		// #{cls('chat.textbox.placeholder')},
+		// #{cls('chat.textbox.slate')} {
+		// 	padding-left: 5px;
+		// }
 
 		#{cls('chat.textbox.channelTextarea')} {
             background: none; 
@@ -72,4 +72,4 @@ div.scrollableContainer__74017.themedBackground__74017 {
 		}
 		//#endregion Attachments
 	}
-}
+}
diff --git a/src/theme/chat/_container.scss b/src/theme/chat/_container.scss
@@ -41,5 +41,10 @@
 			background-color: var(--foreground-triple);
 		}
 	}
+
+	// TODO: add this this discordclasses
+	.chatGradientBase__36d07 {
+		display: none;
+	}
 	//#endregion Chat
 }
diff --git a/src/theme/chat/_messages.scss b/src/theme/chat/_messages.scss
@@ -3,7 +3,7 @@
 		margin-left: 0;
 		padding-left: 0;
 	}
-	.message__89466 {
+	.message_fd14e0 {
 		background: transparent;
 		box-shadow: none;
 	}
@@ -44,7 +44,7 @@
 	}
 
 	//Username or channel mention
-	.wrapper_f61d60 {
+	.wrapper__4106a {
 		background: var(--gradient);
 		color: var(--text-normal);
 	}
diff --git a/src/theme/guilds/_container.scss b/src/theme/guilds/_container.scss
@@ -1,4 +1,4 @@
-#app-mount .guilds_c48ade {
+#app-mount .guilds__5e434 {
 	background-color: transparent;
 	.footer__214dc {
 		background-color: rgb(0, 0, 0, var(--serverlist-brightness));
diff --git a/src/theme/guilds/_folder.scss b/src/theme/guilds/_folder.scss
@@ -1,4 +1,4 @@
-#app-mount .guilds_c48ade {
+#app-mount .guilds__5e434 {
 	// This is disabled for now as the background is transparent by default so the coloring actually looks nice by default
 	// [class*='expandedFolderBackground'] {
 	// 	background: var(--foreground);
diff --git a/src/theme/guilds/_server.scss b/src/theme/guilds/_server.scss
@@ -1,4 +1,4 @@
-#app-mount .guilds_c48ade {
+#app-mount .guilds__5e434 {
 	// Home button
 	.tutorialContainer__1f388 {
 		.childWrapper_a6ce15 {
diff --git a/src/theme/modals/_modals.scss b/src/theme/modals/_modals.scss
@@ -3,7 +3,7 @@
 		transform: scale(1) translateZ(0px) !important;
 		animation: fadeInTop 0.3s ease forwards !important;
 	}
-	.modal__7f8f5 {
+	.modal_ab9bdf {
 		background-color: transparent;
 		box-shadow: none;
 		.cardWarning-2yPNAa {
diff --git a/src/theme/modals/_reactions.scss b/src/theme/modals/_reactions.scss
@@ -1,6 +1,6 @@
 #app-mount {
-	.scroller_cc2dff,
-	.reactors_cc2dff {
+	.scroller_b7f4b4,
+	.reactors_b7f4b4 {
 		background: transparent;
 	}
 }
diff --git a/src/theme/pages/_discovery.scss b/src/theme/pages/_discovery.scss
@@ -1,4 +1,4 @@
-#app-mount .content_c48ade {
+#app-mount .content__5e434 {
 	.discoverHeader-1TWTqG {
 		margin: 0 0 10px;
 		height: 48px;
diff --git a/src/theme/pages/_friends.scss b/src/theme/pages/_friends.scss
@@ -9,7 +9,7 @@
 		background: transparent;
 	}
 
-	.itemCard__7e549, .card__2eab1, .blockedIgnoredSettingsNotice__6811a {
+	.itemCard__7e549, .card_eafb9c, .blockedIgnoredSettingsNotice__6811a {
 		border: none;
 		background: var(--foreground-half)
 	}
diff --git a/src/theme/popouts/_emojipicker.scss b/src/theme/popouts/_emojipicker.scss
@@ -77,7 +77,7 @@
 	}
 
 	//Stuff that should only apply to the super reaction picker
-	.appAsidePanelWrapper_a3002d .layerContainer_da8173 .clickTrapContainer_da8173 .layer_da8173 > div:has(.isBurstReactionPicker_c0e32c) {
+	.appAsidePanelWrapper_a3002d .layerContainer__59d0d .clickTrapContainer__59d0d .layer__59d0d > div:has(.isBurstReactionPicker_c0e32c) {
 		//Set back discord stupid super react effect but on a different layer because otherwise we cannot use a proper background
 		box-shadow: 0 0 0 2px var(--bg-brand);
 		border-radius: var(--custom-emoji-picker-border-radius);
@@ -95,7 +95,7 @@
 	}
 
 	//Stuff that should only apply to the reaction picker
-	.appAsidePanelWrapper_a3002d .layerContainer_da8173 .clickTrapContainer_da8173:not(:has(.emojiPickerHasTabWrapper_c0e32c)) #emoji-picker-tab-panel {
+	.appAsidePanelWrapper_a3002d .layerContainer__59d0d .clickTrapContainer__59d0d:not(:has(.emojiPickerHasTabWrapper_c0e32c)) #emoji-picker-tab-panel {
 		.categoryList_c0e32c {
 			top: 68px;
 		}
@@ -118,7 +118,7 @@
 			box-shadow: none;
 		}
 
-		.wrapper__14245, .wrapper__4e6ce {
+		.wrapper__14245, .wrapper__0d1ef {
 			background: var(--background-secondary);
 			// backdrop-filter: blur(10px) brightness(var(--frostedglass-emojipicker-header-brightness));
 
diff --git a/src/theme/settings/_usersettings.scss b/src/theme/settings/_usersettings.scss
@@ -81,7 +81,7 @@
 
 		//#region Keybinds
 		//FIXME: fix this, i dont have desktop discord
-		.card_b846e5::before {
+		._4bb93312e84f332e-card::before {
 			border-color: transparent;
 			background: var(--foreground);
 		}
diff --git a/src/theme/sidebar/_channels.scss b/src/theme/sidebar/_channels.scss
@@ -25,7 +25,7 @@
 		}
 
 		//#region VC with user limit
-		//FIXME: This is still very much broken visually and i have no idea what containerUserOver_c69b6d is
+		//FIXME: This is still very much broken visually and i have no idea what c69b6db0641110f6-containerUserOver is
 		#{cls('sidebar.channel.users')} {
 			background: var(--foreground);
 			padding: 0 5px;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@`
`25`	`25`	`border: none;`
`26`	`26`	`}`
`27`	`27`
`28`		`- .container__9293f, .container__133bf {`
	`28`	`+ .container__9293f,`
	`29`	`+ .container__133bf {`
`29`	`30`	`border: none;`
`30`	`31`	`}`
`31`	`32`
`@@ -84,4 +85,4 @@ html.custom-theme-background #{cls('mount app.inner')}::before {`
`84`	`85`	`font-weight: 700;`
`85`	`86`	`font-size: larger;`
`86`	`87`	`z-index: 9000;`
`87`		`-}`
	`88`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@`
`76`	`76`	`color: rgb(255, 255, 255, 0.5);`
`77`	`77`	`}`
`78`	`78`	`// Radio buttons`
`79`		`- .item__001a7 {`
	`79`	`+ .item__88a69 {`
`80`	`80`	`border: none;`
`81`	`81`	`background: var(--background-secondary);`
`82`	`82`	`.checkbox-1ix_J3 {`
`@@ -95,9 +95,9 @@`
`95`	`95`	`polyline {`
`96`	`96`	`stroke: rgb(var(--gradient-primary));`
`97`	`97`	`}`
`98`		`- &:has(> .radioBar__001a7[style*='--radio-bar-accent-color']) {`
	`98`	`+ &:has(> .radioBar__88a69[style*='--radio-bar-accent-color']) {`
`99`	`99`	`background: transparent !important;`
`100`		`- .radioBar__001a7 {`
	`100`	`+ .radioBar__88a69 {`
`101`	`101`	`background: var(--radio-bar-accent-color);`
`102`	`102`	`}`
`103`	`103`	`}`
`@@ -134,7 +134,7 @@`
`134`	`134`	`}`
`135`	`135`	`// Select`
`136`	`136`	`[class='css'][class='control'],`
`137`		`- .select__3f413 {`
	`137`	`+ .select_a16aea {`
`138`	`138`	`background: var(--background-secondary);`
`139`	`139`	`border-color: transparent;`
`140`	`140`	`}`
`@@ -143,7 +143,7 @@`
`143`	`143`	`opacity: 1;`
`144`	`144`	`}`
`145`	`145`	`// Select Dropdown`
`146`		`- .popout__3f413 {`
	`146`	`+ .popout_a16aea {`
`147`	`147`	`backdrop-filter: blur(var(--overlay-blur, 5px));`
`148`	`148`	`background: rgb(0 0 0 / var(--overlay-brightness));`
`149`	`149`	`overflow-y: scroll !important;`
Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,10 @@`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`12`		`-// Discords new titlebar`
`13`		`-#app-mount {`
`14`		`- .bar_c38106 {`
`15`		`- background-color: rgb(0, 0, 0, var(--serverlist-brightness));`
`16`		`- }`
`17`		`-}`
`18`		`-`
`19`	`12`	`// Makes the top bar more easily grabbable`
`20`	`13`	`.titleBar__421ed {`
`21`	`14`	`height: 20px !important;`
`22`	`15`	`-webkit-app-region: drag;`
`23`	`16`	`pointer-events: none;`
`24`	`17`	`top: 0;`
`25`	`18`	`}`
`26`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`#app-mount {`
`2`		`- .tooltip__382e7 {`
	`2`	`+ .tooltip_c36707 {`
`3`	`3`	`color: var(--text-normal);`
`4`	`4`	`text-align: center;`
`5`	`5`	`font-weight: 600;`
`6`	`6`	`}`
`7`		`- .tooltipPrimary__382e7 {`
	`7`	`+ .tooltipPrimary_c36707 {`
`8`	`8`	`background: var(--gradient);`
`9`		`- .tooltipPointer__382e7 {`
	`9`	`+ .tooltipPointer_c36707 {`
`10`	`10`	`display: none;`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,10 @@ div.scrollableContainer__74017.themedBackground__74017 {`
`43`	`43`	`background: transparent;`
`44`	`44`	`}`
`45`	`45`
`46`		`- #{cls('chat.textbox.placeholder')},`
`47`		`- #{cls('chat.textbox.slate')} {`
`48`		`- padding-left: 5px;`
`49`		`- }`
	`46`	`+ // #{cls('chat.textbox.placeholder')},`
	`47`	`+ // #{cls('chat.textbox.slate')} {`
	`48`	`+ // padding-left: 5px;`
	`49`	`+ // }`
`50`	`50`
`51`	`51`	`#{cls('chat.textbox.channelTextarea')} {`
`52`	`52`	`background: none;`
`@@ -72,4 +72,4 @@ div.scrollableContainer__74017.themedBackground__74017 {`
`72`	`72`	`}`
`73`	`73`	`//#endregion Attachments`
`74`	`74`	`}`
`75`		`-}`
	`75`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,10 @@`
`41`	`41`	`background-color: var(--foreground-triple);`
`42`	`42`	`}`
`43`	`43`	`}`
	`44`	`+`
	`45`	`+ // TODO: add this this discordclasses`
	`46`	`+ .chatGradientBase__36d07 {`
	`47`	`+ display: none;`
	`48`	`+ }`
`44`	`49`	`//#endregion Chat`
`45`	`50`	`}`