Fixed editing messages, emoji picker

DiscordStyles · Aug 1, 2023 · 2c442e7 · 2c442e7
1 parent c0e1d27
commit 2c442e7
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 214 deletions.
diff --git a/src/addons/_icons.scss b/src/addons/_icons.scss
@@ -74,7 +74,7 @@
 	svg:has(path[d^='M17 11V7C17 4.243']) {
 		mask-image: url(mono.$lock-closed);
 	}
-	
+
 	// Members channel
 	svg:has(path[d^='M14 8.00598C14 10.211 12.206 12.006']) {
 		mask-image: url(mono.$people);
@@ -250,7 +250,7 @@ $icons: (
 	'user-context-add-friend': mono.$user-add,
 	'user-context-remove-friend': mono.$user-delete,
 	'user-context-block': mono.$user-denied,
-	'user-context-mute': mono.$speaker-off,
+	'user-context-mute': mono.$mic-off,
 	'user-context-disable-video': mono.$video-off,
 	'user-context-voice-mute': mono.$mic-off,
 	'user-context-voice-deafen': mono.$speaker-off,
@@ -264,6 +264,7 @@ $icons: (
 	'user-context-devmode-copy-id': mono.$copy,
 	'user-context-add-friend-nickname': mono.$rename,
 	'user-context-soundboard-sound-mute': mono.$speaker-off,
+	'user-context-deafen': mono.$speaker-off,
 
 	// Settings
 	'user-settings-cog-My_Account': mono.$user,
@@ -293,8 +294,10 @@ $icons: (
 	'user-settings-cog-Sessions': mono.$phone-laptop,
 	'user-settings-cog-Friend_Requests': mono.$user-available,
 	'user-settings-cog-Activity_Privacy': mono.$shield-check,
+	'user-settings-cog-Family_Center': mono.$people,
 
 	// Channel (right click toolbar)
+	'channel-context-mark-channel-read': mono.$eye,
 	'channel-context-mute-channel': mono.$speaker-off,
 	'channel-context-copy-channel-topic': mono.$copy,
 	'channel-context-edit-channel': mono.$pen,
@@ -322,6 +325,7 @@ $icons: (
 	'guild-header-popout-report-raid': mono.$megaphone,
 	'guild-header-popout-active-threads': mono.$comment-multi,
 	'guild-header-popout-insights': mono.$eye,
+	'guild-header-popout-hide-muted-channels': mono.$eye,
 
 	// Server dropdown (right click)
 	'guild-context-mark-guild-read': mono.$eye,
@@ -340,6 +344,8 @@ $icons: (
 	'guild-context-create-event': mono.$calendar,
 
 	// Message more options
+	'message-actions-add-reaction-0': mono.$emoji,
+	'message-actions-add-reaction-1': mono.$emoji-laugh,
 	'message-actions-reply': mono.$reply,
 	'message-actions-mark-unread': mono.$comment-note,
 	'message-actions-copy-link': mono.$link,
@@ -354,9 +360,8 @@ $icons: (
 	'account-switch-account': mono.$user-swap
 );
 
-.item-5ApiZt:not(#account-status-picker, [role='menuitemcheckbox'], [role='menuitemradio'], .hideInteraction-1vQrZJ) {
-	.icon-3XHs8t,
-	.iconContainer-Ksy8Oj:has(.icon-3XHs8t):not(:has(path[d*='M18.625'])) {
+.item-5ApiZt:not(#account-status-picker, [role='menuitemradio'], .hideInteraction-1vQrZJ) {
+	.icon-3XHs8t {
 		display: none !important;
 	}
 	&[role='menuitem'],
@@ -369,6 +374,9 @@ $icons: (
 			background: currentColor;
 			margin-right: 8px;
 		}
+		& + .layer-2BGhQ8 .item-5ApiZt::before {
+			content: none;
+		}
 		&.focused-3qFvc8::before {
 			background: var(--text-primary);
 		}

diff --git a/src/theme/_vars.scss b/src/theme/_vars.scss
@@ -1,5 +1,5 @@
 :root {
-	--fluent-version: '1.1.3';
+	--fluent-version: '1.1.4';
 
 	--transition: cubic-bezier(0, 0, 0, 1);
 

diff --git a/src/theme/chat/_message.scss b/src/theme/chat/_message.scss
@@ -1,7 +1,7 @@
 @use '../mixins';
 
 #app-mount {
-	.message-2CShn3.selected-2LX7Jy.cozyMessage-1DWF9U .contents-2MsGLg {
+	.message-2CShn3:has(.channelTextArea-1VQBuV).cozyMessage-1DWF9U .contents-2MsGLg {
 		display: block;
 		width: 100%;
 		background: var(--bg-content);
@@ -19,9 +19,12 @@
 		.inner-NQg18Y::before {
 			content: none;
 		}
+		.buttons-uaqb-5 {
+			height: auto;
+		}
 	}
 	.operations-3q3u6E {
-		padding: 12px;
+		padding: 8px 16px 16px 16px;
 	}
 	.mentioned-Tre-dv {
 		background: rgb(var(--chat-mention-colour), 0.05);

diff --git a/src/theme/inputs/_select.scss b/src/theme/inputs/_select.scss
@@ -1,7 +1,7 @@
 @use '../mixins';
 
 #app-mount {
-	.select-1Ia3hD {
+	.select-Zz0IcO {
 		background: var(--btn-bg);
 		font-weight: var(--font-weight-regular);
 		color: var(--text-normal);
@@ -30,7 +30,7 @@
 		}
 	}
 
-	.popout-1KHNAq {
+	.popout-15UxD6 {
 		background: var(--bg-menu);
 		border-radius: var(--rounded);
 		border: 1px solid var(--border);
@@ -42,7 +42,7 @@
 		gap: 4px;
 		max-height: 350px !important;
 	}
-	.option-2eIyOn {
+	.option-Uc12mm {
 		border-radius: var(--rounded);
 		font-size: var(--font-size-sm);
 		padding: 10px 14px;
@@ -68,7 +68,7 @@
 			}
 		}
 	}
-	.selectedIcon-19TbzU {
+	.selectedIcon-122rMx {
 		display: none;
 	}
 	.optionLabel-1h0MHL {

diff --git a/src/theme/popouts/_emojipicker.scss b/src/theme/popouts/_emojipicker.scss
@@ -4,12 +4,14 @@
 		border-radius: var(--rounded);
 		border: 1px solid var(--border-high);
 		box-shadow: var(--shadow-flyout);
-		grid-template-rows: 40px auto;
 		padding-top: 4px;
+		border-bottom: 1px solid var(--border-high);
 		[class^='header-']:not([aria-expanded]) {
-			border-bottom: 1px solid var(--border-high);
 			box-shadow: none;
 		}
+		&:has(.nav-1zWVQw) {
+			grid-template-rows: 40px auto;
+		}
 	}
 	.inspector-DFKXwB {
 		border-top: 1px solid var(--border-high);

diff --git a/src/theme/popouts/_menuicons.scss b/src/theme/popouts/_menuicons.scss
diff --git a/src/theme/profile/_popout.scss b/src/theme/profile/_popout.scss
@@ -46,7 +46,7 @@
 			position: absolute;
 			right: unset;
 			left: 16px;
-			top: 76px;
+			top: 105px;
 			z-index: 2;
 			background: transparent;
 			padding: 0;

diff --git a/src/theme/sidebar/_container.scss b/src/theme/sidebar/_container.scss
@@ -20,7 +20,7 @@
 		}
 	}
 	.content-yjf30S > li:last-child {
-		padding-bottom: calc(var(--bottombar-height) + 72px);
+		padding-bottom: 16px;
 	}
 	.container-1NXEtd {
 		background: var(--bg-alt);