From 9434360d91c60dddd3ba91f92fec8661b713de70 Mon Sep 17 00:00:00 2001 From: CapnKitten <4013216+CapnKitten@users.noreply.github.com> Date: Sun, 6 Aug 2023 03:53:41 -0400 Subject: [PATCH] Update source --- Themes/Material-Discord/main.scss | 1 + .../src/_selectorPlaceholders.scss | 78 ++++++++++++++++--- Themes/Material-Discord/src/_variables.scss | 2 +- .../src/channels/_channels.scss | 12 +++ .../betterdiscord/plugins/_channelTabs.scss | 64 +++++++++++++++ Themes/Material-Discord/src/forum/_forum.scss | 4 + .../src/icons/_contextMenuIcons.scss | 4 + .../src/messages/_messages.scss | 17 +++- .../src/modals/_createInvite.scss | 20 +++++ .../src/popouts/_emojiPicker.scss | 6 ++ .../src/settings/_sidebar.scss | 4 +- 11 files changed, 195 insertions(+), 17 deletions(-) create mode 100644 Themes/Material-Discord/src/clients/betterdiscord/plugins/_channelTabs.scss diff --git a/Themes/Material-Discord/main.scss b/Themes/Material-Discord/main.scss index 4fae2629..920b252d 100644 --- a/Themes/Material-Discord/main.scss +++ b/Themes/Material-Discord/main.scss @@ -24,6 +24,7 @@ @use 'src/clients/betterdiscord/plugins/betterFormattingRedux'; @use 'src/clients/betterdiscord/plugins/channelDms'; +@use 'src/clients/betterdiscord/plugins/channelTabs'; @use 'src/clients/betterdiscord/plugins/charCounter'; @use 'src/clients/betterdiscord/plugins/hideChannels'; @use 'src/clients/betterdiscord/plugins/imageUtilities'; diff --git a/Themes/Material-Discord/src/_selectorPlaceholders.scss b/Themes/Material-Discord/src/_selectorPlaceholders.scss index 3dd55d37..a2619d09 100644 --- a/Themes/Material-Discord/src/_selectorPlaceholders.scss +++ b/Themes/Material-Discord/src/_selectorPlaceholders.scss @@ -577,6 +577,9 @@ .iconItem-1EjiK0 { @extend %channelButton !optional; } +.voiceChannelsButton-SRmgo8 { + @extend %voiceChannelsButton !optional; +} .newChannel-3q3LPr { @extend %channelNewChannel !optional; } @@ -1762,9 +1765,6 @@ .tabButton-1hJ4oW { @extend %autocompletetabButton !optional; } -.wrapper-3Un6-K { - @extend %autocompleteAvatarWrapper !optional; -} .mobileContainer-38hqQU { @extend %mobileContainer !optional; } @@ -2764,6 +2764,9 @@ .icon-18rqoe { @extend %chatSearchIcon !optional; } +.visible-2yTnyW { + @extend %chatSearchIconVisible !optional; +} .libraryFilter-1nwg6T { @extend %librarySearch !optional; } @@ -3358,9 +3361,6 @@ .attachment-1PZZB2 { @extend %attachment !optional; } -.newMosaicStyle-35X6XO { - @extend %attachmentNewMosiacStyle !optional; -} .nonMediaAttachment-3C_4Pd { @extend %attachmentNonMediaAttachment !optional; } @@ -3376,8 +3376,8 @@ .video-2HW4jD { @extend %attachmentVideo !optional; } -.embedWrapper-1MtIDg { - @extend %attachmentEmbedWrapper !optional; +.newMosaicStyle-2jdUaP { + @extend %attachmentNewMosaicStyle !optional; } .icon-1KCy88 { @extend %attachmentIcon !optional; @@ -4027,6 +4027,9 @@ pre { .spoiler-3aUoEX { @extend %spoilerImage !optional; } +.spoilerMarkdownContent-2R1Vwe { + @extend %spoilerMarkdownContent !optional; +} .hiddenSpoilers-19m4Pg { @extend %spoilerImageHidden !optional; } @@ -4099,9 +4102,12 @@ pre { .multiInputField-1zyopx { @extend %multiInputField !optional; } -.copyInput-3AbKWB { +.copyInput-3AbKWB, .copyInput-3QjTFp { @extend %copyInput !optional; } +.copyButton-1iZgH4 { + @extend %copyButton !optional; +} .input-2QVoG3 { @extend %copyInputInner !optional; } @@ -5467,6 +5473,12 @@ pre { .imageUploaderIcon-2OHmFu { @extend %settingsImageUploaderIcon !optional; } +.cardHeader-3d6H8N { + @extend %applicationPermissionsCardHeader !optional; +} +.group-1-kPpw { + @extend %applicationPermissionsButtonGroup !optional; +} .card-16VQ8C { @extend %settingsCard !optional; } @@ -6334,6 +6346,9 @@ pre { .wrapper-3Un6-K { @extend %avatarWrapper !optional; } +.pointerEvents-2KjWnj { + @extend %avatarStatusRect !optional; +} .mask-1FEkla { @extend %avatarMask !optional; } @@ -6742,9 +6757,6 @@ pre { .emptyText-29ycwI { @extend %emptyActiveNowText !optional; } -.button-1zW0-r { - @extend %quickReactButton !optional; -} .focused-H4w81f { @extend %quickReactButtonFocused !optional; } @@ -6811,6 +6823,9 @@ pre { .placeholderCard-3eGmb3 { @extend %stickersPlaceholderCard !optional; } +.action-2YPPom { + @extend %stickersCardButtons !optional; +} .form-QIWuKf { @extend %stickersUploadForm !optional; } @@ -6826,6 +6841,15 @@ pre { .foreground-3_3Pgi { @extend %stickersProgressForground !optional; } +.tierAccomplished-1I5NaT { + @extend %stickersTierAccomplished !optional; +} +.tierCurrent-2nowYi { + @extend %stickersTierCurrent !optional; +} +.tierFirst-1Vn3wS{ + @extend %stickersTierFirst !optional; +} .tierInProgress-1vFUnw { @extend %stickersTierInProgress !optional; } @@ -8965,6 +8989,9 @@ pre { .inviteSplash-2Q0PLE { @extend %inviteModalSplash !optional; } +.temporaryMembershipContainerBackground-13Hf5U { + @extend %inviteTemporaryMembershipContainerBackground !optional; +} .tableTitle-2Amyqt { @extend %soundboardSettingsTableTitle !optional; } @@ -9184,3 +9211,30 @@ pre { .guestBody-1S2A2E { @extend %guestBody !optional; } +#channelTabs-container { + @extend %channelTabsContainer !optional; +} +.channelTabs-tabContainer { + @extend %channelTabsTabContainer !optional; +} +.channelTabs-tabNav { + @extend %channelTabsTabNav !optional; +} +.channelTabs-tab { + @extend %channelTabsTab !optional; +} +.channelTabs-selected { + @extend %channelTabsTabSelected !optional; +} +.channelTabs-tabName { + @extend %channelTabsTabName !optional; +} +.channelTabs-unreadBadge { + @extend %channelTabsUnreadBadge !optional; +} +.channelTabs-closeTab { + @extend %channelTabsCloseTab !optional; +} +.channelTabs-newTab { + @extend %channelTabsNewTab !optional; +} diff --git a/Themes/Material-Discord/src/_variables.scss b/Themes/Material-Discord/src/_variables.scss index 75ed2d12..a6aa8583 100644 --- a/Themes/Material-Discord/src/_variables.scss +++ b/Themes/Material-Discord/src/_variables.scss @@ -32,7 +32,7 @@ --main-textarea-border: var(--input-border-color); --main-textarea-radius: 24px; - --media-radius: calc(var(--message-radius) / 1.25); + --media-radius: calc(var(--message-radius) / 1.5); --card-radius: 8px; --card-radius-big: 18px; diff --git a/Themes/Material-Discord/src/channels/_channels.scss b/Themes/Material-Discord/src/channels/_channels.scss index e7e80064..8d4f75f4 100644 --- a/Themes/Material-Discord/src/channels/_channels.scss +++ b/Themes/Material-Discord/src/channels/_channels.scss @@ -53,6 +53,18 @@ } } +%voiceChannelsButton { + background-color: hsla(var(--button-link-accent-color),0.15); + border-radius: 16px; + border: none; + color: var(--text-normal); + transition: var(--default-time) var(--default-animation) background-color; + + &:hover { + background-color: hsla(var(--button-link-accent-color),0.2); + } +} + %bannerAnimatedContainer { box-shadow: none; } diff --git a/Themes/Material-Discord/src/clients/betterdiscord/plugins/_channelTabs.scss b/Themes/Material-Discord/src/clients/betterdiscord/plugins/_channelTabs.scss new file mode 100644 index 00000000..7fe3d627 --- /dev/null +++ b/Themes/Material-Discord/src/clients/betterdiscord/plugins/_channelTabs.scss @@ -0,0 +1,64 @@ +/* + * + * BETTERDISCORD PLUGIN -> ChannelTabs + * + */ + +%channelTabsContainer { + padding: 4px 8px !important; +} + +%channelTabsTabContainer { + gap: 4px; + + %channelTabsTabNav { + gap: 4px; + margin: 0 4px 0 0 !important; + + > div { + margin-right: 0 !important; + border-radius: 16px !important; + transition: var(--default-time) var(--default-animation) background-color, var(--default-time) var(--default-animation) color; + + &:hover { + background-color: var(--menu-item-hover) !important; + } + } + } +} + +%channelTabsTab { + margin-bottom: 0 !important; + border-radius: var(--popout-radius) !important; + transition: var(--default-time) var(--default-animation) background-color; + + &:hover { + background-color: var(--menu-item-hover) !important; + } + + &%channelTabsTabSelected { + background-color: var(--menu-item-select) !important; + } + + %channelTabsTabName { + font-weight: 500; + transition: var(--default-time) var(--default-animation) color; + } +} + +%channelTabsUnreadBadge { + background-color: hsl(var(--accent-hsl--material-you)) !important; + color: var(--accent-text-color--material-you) !important; +} + +%channelTabsCloseTab { + border-radius: 8px !important; + transition: var(--default-time) var(--default-animation) background-color, var(--default-time) var(--default-animation) color; +} + +%channelTabsNewTab { + width: 32px !important; + height: 32px !important; + margin: 0 0 0 4px !important; + border-radius: 16px !important; +} diff --git a/Themes/Material-Discord/src/forum/_forum.scss b/Themes/Material-Discord/src/forum/_forum.scss index 282b69dc..8067eb47 100644 --- a/Themes/Material-Discord/src/forum/_forum.scss +++ b/Themes/Material-Discord/src/forum/_forum.scss @@ -198,6 +198,10 @@ %lineClamp1 { padding: 0 8px 0 6px; } + + &[aria-label] { + padding: 0 6px; + } } } diff --git a/Themes/Material-Discord/src/icons/_contextMenuIcons.scss b/Themes/Material-Discord/src/icons/_contextMenuIcons.scss index 013db965..b9eb1f52 100644 --- a/Themes/Material-Discord/src/icons/_contextMenuIcons.scss +++ b/Themes/Material-Discord/src/icons/_contextMenuIcons.scss @@ -42,6 +42,7 @@ &[id*="-image"], &[id*="-native-link"], &[id*="thread-context-"], + &[id*="text-context-"], &[id*="user-settings-cog-"], &[id*="user-profile-actions-"], &#message-favorite, @@ -167,6 +168,9 @@ 'message-open-native-link': 'open_in_new', 'message-actions-remove-reactions': 'remove_circle', + 'text-context-search-google': 'search', + 'text-context-copy': 'content_copy', + 'thread-context-mark-channel-read': 'visibility', 'thread-context-channel-copy-link': 'content_copy', 'thread-context-unarchive-thread': 'unarchive', diff --git a/Themes/Material-Discord/src/messages/_messages.scss b/Themes/Material-Discord/src/messages/_messages.scss index e8d926a0..c385a3cd 100644 --- a/Themes/Material-Discord/src/messages/_messages.scss +++ b/Themes/Material-Discord/src/messages/_messages.scss @@ -209,7 +209,7 @@ position: absolute; width: 0; height: 0; - top: calc(var(--message-radius) / 1.15 * -1); + top: calc(var(--message-radius) / 1.1 * -1); background-color: transparent; border: calc(var(--message-radius) / 2.25) solid transparent; border-bottom-color: var(--message-color); @@ -492,7 +492,7 @@ %messageContentInner { position: relative; background-color: hsla(var(--accent-hsl),0.15); - border-radius: var(--card-radius); + border-radius: calc(var(--message-radius) / 1.4); transition: var(--default-time) var(--default-animation) background-color; &:hover { @@ -511,6 +511,19 @@ } } } + + %messageContent { + %messageContentInner { + margin: 0 -4px; + padding: 0 4px; + } + } + + %messageReplied { + %messageContentInner { + padding: 0 1px 0 4px; + } + } } %avatarDecoration { diff --git a/Themes/Material-Discord/src/modals/_createInvite.scss b/Themes/Material-Discord/src/modals/_createInvite.scss index ea90a0be..ebcf94d8 100644 --- a/Themes/Material-Discord/src/modals/_createInvite.scss +++ b/Themes/Material-Discord/src/modals/_createInvite.scss @@ -68,3 +68,23 @@ margin-left: 16px; } } + +%input { + %copyInput { + padding: var(--input-padding); + } + + %copyButton { + margin-right: 4px !important; + } +} + +%inviteTemporaryMembershipContainerBackground { + margin-top: 8px; + background-color: var(--card-color-filled); + border-radius: var(--card-radius-big); + + &:before { + display: none; + } +} diff --git a/Themes/Material-Discord/src/popouts/_emojiPicker.scss b/Themes/Material-Discord/src/popouts/_emojiPicker.scss index f7656cb6..d92b1fd8 100644 --- a/Themes/Material-Discord/src/popouts/_emojiPicker.scss +++ b/Themes/Material-Discord/src/popouts/_emojiPicker.scss @@ -255,6 +255,12 @@ } } +%callReactionContainer { + %emojiCategoryWrapper { + top: 66px; + } +} + %emojiCategoryWrapper { background-color: var(--attachment-color); diff --git a/Themes/Material-Discord/src/settings/_sidebar.scss b/Themes/Material-Discord/src/settings/_sidebar.scss index 09c01561..24495688 100644 --- a/Themes/Material-Discord/src/settings/_sidebar.scss +++ b/Themes/Material-Discord/src/settings/_sidebar.scss @@ -104,7 +104,7 @@ %settingsCustomScroller > div { flex: 1 1 auto; min-width: 350px; - max-width: 1200px; + max-width: 1400px; left: 0; right: 0; margin: 0 auto; @@ -137,7 +137,7 @@ > div { position: relative; min-width: 350px; - max-width: 1200px; + max-width: 1400px; margin: 0 auto 60px; padding: 60px 97px 60px 60px !important;