From 3841c99735f50ad839aafdbd01b51beba250d74c Mon Sep 17 00:00:00 2001 From: LeafyLuigi <13402990+LeafyLuigi@users.noreply.github.com> Date: Mon, 27 Jan 2025 19:19:06 +0800 Subject: [PATCH] backend changes --- classes | 2 +- src/channels/category.scss | 26 +++--- src/channels/channels.scss | 150 +++++++++++++++--------------- src/channels/indicators.scss | 4 +- src/channels/privateChannels.scss | 50 +++++----- src/chat/bars.scss | 2 +- src/chat/stageCall.scss | 6 +- src/general/badge.scss | 10 +- src/profiles/userProfiles.scss | 4 +- src/users/avatar.scss | 2 +- src/users/status.scss | 2 +- 11 files changed, 129 insertions(+), 129 deletions(-) diff --git a/classes b/classes index e5354933..3f34388f 160000 --- a/classes +++ b/classes @@ -1 +1 @@ -Subproject commit e535493307f31961520a0b1564d2dd61c10667f6 +Subproject commit 3f34388f35ae8343eea8aaaa12695f4ebbc130a9 diff --git a/src/channels/category.scss b/src/channels/category.scss index 4ae8f3a7..a42bd6ab 100644 --- a/src/channels/category.scss +++ b/src/channels/category.scss @@ -1,18 +1,18 @@ @use "backend" as *; /* CHANNEL CATEGORY */ -:is(#{c(sidebar categoryContainerDefault)},#{c(sidebar channelDragOver)},#{c(sidebar containerDragBefore)},#{c(sidebar containerDragAfter)}) { +:is(#{c(sidebar server category container)},#{c(sidebar server channel userOver)},#{c(sidebar server dragBefore)},#{c(sidebar server dragAfter)}) { padding-top: 16px; } -#{c(sidebar categoryWrapper)} { +#{c(sidebar server category wrapper)} { padding-left: 10px; padding-right: 0; transition: all 0.3s ease-in-out; } -#{c(sidebar categoryArrow)} { +#{c(sidebar server category icon)} { display: none; } -#{c(sidebar categoryName)} { +#{c(sidebar server category name)} { display: flex; align-items: center; justify-content: center; @@ -37,26 +37,26 @@ background: linear-gradient(to right, cv('colors.main') 50%, transparent); margin-left: 5px; } - #{c(sidebar categoryMainContent)}:hover & { + #{c(sidebar server category mainContent)}:hover & { opacity: 1; } } #{c(sidebar sidebar)} { - :is(#{c(sidebar categoryContainerDefault)},#{c(sidebar channelDragOver)},#{c(sidebar containerDragBefore)},#{c(sidebar containerDragAfter)}) { - #{c(sidebar categoryWrapper)} { - #{c(sidebar categoryName)} { + :is(#{c(sidebar server category container)},#{c(sidebar server channel userOver)},#{c(sidebar server dragBefore)},#{c(sidebar server dragAfter)}) { + #{c(sidebar server category wrapper)} { + #{c(sidebar server category name)} { color: cv('colors.main'); } } } } -#{c(sidebar categoryChildren)} { +#{c(sidebar server category children)} { margin-left: 3px; } // COLLAPSED -#{c(sidebar categoryCollapsed)} { - #{c(sidebar categoryName)} { +#{c(sidebar server category collapsed)} { + #{c(sidebar server category name)} { &:before, &:after { flex-grow: 0; @@ -65,12 +65,12 @@ } // MUTED -#{c(sidebar categoryMuted)} { +#{c(sidebar server category muted)} { opacity: 0.5; } // ADD CHANNEL ICON -#{c(sidebar categoryAddButtonIcon)} { +#{c(sidebar server category addButtonIcon)} { color: cv('colors.main'); opacity: 0.7; transition: all 0.3s ease-in-out; diff --git a/src/channels/channels.scss b/src/channels/channels.scss index 73c19b2d..423e923c 100644 --- a/src/channels/channels.scss +++ b/src/channels/channels.scss @@ -10,12 +10,12 @@ border-radius: 0; } } -#{c(main dark)} #{c(sidebar channelsContainer)} { +#{c(main dark)} #{c(sidebar server container)} { background: transparent; } // CHANNELS HEADER -#{c(sidebar channelsHeader)} { +#{c(sidebar server header header)} { height: 48px; color: #fff; font-family: cv('font.main'); @@ -27,11 +27,11 @@ } // GUILD BANNER -#{c(sidebar animatedContainer)} { +#{c(sidebar server header bannerContainer)} { background: transparent; box-shadow: none; } -#{c(sidebar bannerImage)} { +#{c(sidebar server header bannerImage)} { width: cv('channels-width'); -webkit-mask: linear-gradient(to bottom, #000, transparent); mask: linear-gradient(to bottom, #000, transparent); @@ -49,10 +49,10 @@ } // CHANNEL CONTENT -#{c(sidebar channelLink)} { +#{c(sidebar server channel link)} { transition: all 0.15s ease-in-out; } -#{c(sidebar channelLink)} { +#{c(sidebar server channel link)} { position: relative; background: transparent !important; &:before { @@ -74,7 +74,7 @@ pointer-events: none; border-radius: 4px; } - #{c(sidebar channelIcon)} { + #{c(sidebar server channel icon)} { width: 18px; height: 18px; margin-right: 3px; @@ -88,16 +88,16 @@ opacity: 1; } } - #{c(sidebar channelName)} { + #{c(sidebar server channel name)} { color: var(--channel-color); transition: all 0.15s ease-in-out; } } -#{c(sidebar channelChildren)} { +#{c(sidebar server channel children)} { margin-left: 1px; animation: cv-fade-to-3 0.15s ease-in-out; } -#{c(sidebar channelActionIcon)} { +#{c(sidebar server channel actionIcon)} { color: #fff; opacity: 0.3; transition: all 0.15s ease-in-out; @@ -108,26 +108,26 @@ opacity: 0.7; } } -#{c(sidebar channelStatusText)}, -#{c(sidebar channelStatusPencilIcon)} { +#{c(sidebar server channel statusText)}, +#{c(sidebar server channel pencilIcon)} { color: hsla(0, 0%, 100%, 0.7); } -#{c(sidebar channelWrapper)} { +#{c(sidebar server channel wrapper)} { // HOVER &:hover { - #{c(sidebar channelName)}, - #{c(sidebar channelIcon)} { + #{c(sidebar server channel name)}, + #{c(sidebar server channel icon)} { color: #fff; } - #{c(sidebar channelLink)} { + #{c(sidebar server channel link)} { background: var(--bg-overlay-hover, var(--background-modifier-hover)); &:before { background: hsla(0, 0%, 100%, 0.1); } - #{c(sidebar channelLinkTop)} { - #{c(sidebar channelContainerDefault)} & { - #{c(sidebar channelIcon)}, - #{c(sidebar channelName)} { + #{c(sidebar server channel linkTop)} { + #{c(sidebar server channel container)} & { + #{c(sidebar server channel icon)}, + #{c(sidebar server channel name)} { color: hsla(0, 0%, 100%, 0.7); } } @@ -135,14 +135,14 @@ } } // UNREAD - &#{c(sidebar channelModeUnreadImportant)} { - #{c(sidebar channelLink)} { - #{c(sidebar channelLinkTop)} { - #{c(sidebar channelName)} { + &#{c(sidebar server channel modeUnreadImportant)} { + #{c(sidebar server channel link)} { + #{c(sidebar server channel linkTop)} { + #{c(sidebar server channel name)} { color: var(--channel-unread); text-shadow: 0 0 3px; } - #{c(sidebar channelIcon)} { + #{c(sidebar server channel icon)} { color: var(--channel-unread); filter: drop-shadow(0 0 3px); opacity: 1; @@ -150,12 +150,12 @@ } } &:hover { - #{c(sidebar channelLink)} { - #{c(sidebar channelLinkTop)} { - #{c(sidebar channelName)} { + #{c(sidebar server channel link)} { + #{c(sidebar server channel linkTop)} { + #{c(sidebar server channel name)} { color: var(--channel-text-selected); } - #{c(sidebar channelIcon)} { + #{c(sidebar server channel icon)} { color: var(--channel-text-selected); } } @@ -163,12 +163,12 @@ } } // SELECTED - &#{c(sidebar channelModeSelected)} { - #{c(sidebar channelName)}, - #{c(sidebar channelIcon)} { + &#{c(sidebar server channel modeSelected)} { + #{c(sidebar server channel name)}, + #{c(sidebar server channel icon)} { color: #fff; } - #{c(sidebar channelLink)} { + #{c(sidebar server channel link)} { &:before { background: hsla(0, 0%, 100%, 0.1); } @@ -177,16 +177,16 @@ background: cv('colors.main'); animation: cv-channel-select 0.3s ease-in-out; } - #{c(sidebar channelContainerDefault)} & { - #{c(sidebar channelIcon)}, - #{c(sidebar channelName)} { + #{c(sidebar server channel container)} & { + #{c(sidebar server channel icon)}, + #{c(sidebar server channel name)} { color: var(--channel-text-selected); } #{c(friends live)} { color: var(--channel-text-selected) !important; } } - #{c(sidebar channelActionIcon)} { + #{c(sidebar server channel actionIcon)} { opacity: 0.7; &:hover { opacity: 1; @@ -200,14 +200,14 @@ } // CONNECTED - &#{c(sidebar channelModeConnected)} { - #{c(sidebar channelLink)} { - #{c(sidebar channelLinkTop)} { - #{c(sidebar channelName)} { + &#{c(sidebar server channel modeConnected)} { + #{c(sidebar server channel link)} { + #{c(sidebar server channel linkTop)} { + #{c(sidebar server channel name)} { color: cv('colors.main'); text-shadow: 0 0 3px; } - #{c(sidebar channelIcon)} { + #{c(sidebar server channel icon)} { color: cv('colors.main'); filter: drop-shadow(0 0 3px); } @@ -215,24 +215,24 @@ } } // MUTED - &#{c(sidebar channelModeMuted)} { - #{c(sidebar channelLink)} { - #{c(sidebar channelLinkTop)} { - #{c(sidebar channelIcon)}, - #{c(sidebar channelName)} { + &#{c(sidebar server channel modeMuted)} { + #{c(sidebar server channel link)} { + #{c(sidebar server channel linkTop)} { + #{c(sidebar server channel icon)}, + #{c(sidebar server channel name)} { color: var(--muted-color); } } } &:hover { - #{c(sidebar channelLink)} { - #{c(sidebar channelLinkTop)} { + #{c(sidebar server channel link)} { + #{c(sidebar server channel linkTop)} { &:before { background: hsla(0, 0%, 100%, 0.07); } - #{c(sidebar channelContainerDefault)} & { - #{c(sidebar channelIcon)}, - #{c(sidebar channelName)} { + #{c(sidebar server channel container)} & { + #{c(sidebar server channel icon)}, + #{c(sidebar server channel name)} { color: var(--channel-color); } } @@ -243,7 +243,7 @@ } // UNREAD & MENTIONS INDICATION -#{c(sidebar channelUnreadBlob)} { +#{c(sidebar server channel unreadBlob)} { display: none; } @@ -253,19 +253,19 @@ } // USER LIMIT -#{c(sidebar channelUsers)}, -#{c(sidebar channelTotal)} { +#{c(sidebar server channel voiceLimitUsers)}, +#{c(sidebar server channel voiceLimitTotal)} { width: 24px; color: hsla(0, 0%, 100%, 0.3); font-weight: 600; text-align: right; transition: all 0.15s ease-in-out; } -#{c(sidebar channelUsers)} { +#{c(sidebar server channel voiceLimitUsers)} { padding: 0 4px 0 6px; background: rgba(0, 0, 0, 0.15); } -#{c(sidebar channelTotal)} { +#{c(sidebar server channel voiceLimitTotal)} { padding: 0 6px 0 4px; background: hsla(0, 0%, 100%, 0.04); box-shadow: inset 1px 0 hsla(0, 0%, 100%, 0.07); @@ -273,40 +273,40 @@ display: none; } } -#{c(sidebar channelModeConnected)} { - #{c(sidebar channelUsers)} { +#{c(sidebar server channel modeConnected)} { + #{c(sidebar server channel voiceLimitUsers)} { color: cv('colors.main'); text-shadow: 0 0 1px; } } // VOICE USER LIST -#{c(sidebar voiceListDefault)} { +#{c(sidebar server channel voice listDefault)} { padding-left: 24px; - #{c(sidebar voiceUserClickable)}:hover #{c(sidebar voiceUserContent)} { + #{c(sidebar server channel voice clickable)}:hover #{c(sidebar server channel voice userContent)} { background: rgba(0, 0, 0, 0.04); } } -#{c(sidebar voiceUser)} { +#{c(sidebar server channel voice user)} { z-index: 1; - #{c(sidebar voiceUserContent)} { + #{c(sidebar server channel voice userContent)} { border-radius: 3px; transition: all 0.15s ease-in-out; } &:hover, &:active, - &#{c(sidebar voiceUserSelected)} { - #{c(sidebar voiceListDefault)} & { - #{c(sidebar voiceUserContent)} { + &#{c(sidebar server channel voice selected)} { + #{c(sidebar server channel voice listDefault)} & { + #{c(sidebar server channel voice userContent)} { background: hsla(0, 0%, 100%, 0.04); } - #{c(sidebar voiceUsername)} { + #{c(sidebar server channel voice username)} { color: hsla(0, 0%, 100%, 0.7); } } } - #{c(sidebar voiceSpeaking)} { + #{c(sidebar server channel voice avatarSpeaking)} { position: relative; transition: all 0.1s ease-in-out; &:after { @@ -323,22 +323,22 @@ border-bottom-right-radius: 0; } } - #{c(sidebar voiceSpeaking)} { + #{c(sidebar server channel voice avatarSpeaking)} { box-shadow: 0 0 0 2px cv('colors.main'), inset 0 0 3px rgba(0, 0, 0, 0.5); &:after { @include pos($top: -2px, $bottom: -2px); width: 150px; } } - #{c(sidebar voiceUsername)} { + #{c(sidebar server channel voice username)} { color: hsla(0, 0%, 100%, 0.5); transition: all 0.1s ease-in-out; } - #{c(sidebar voiceUsernameSpeaking)} { + #{c(sidebar server channel voice usernameSpeaking)} { color: #fff !important; } } -#{c(other cv voiceChannelsButton)} { +#{c(sidebar server category voiceChannelsButton)} { border: 1px solid cv('colors.main'); &:hover { background: cv('colors.hover'); @@ -361,15 +361,15 @@ } // DRAG INDICATORS -:is(#{c(sidebar containerDragAfter)}, #{c(sidebar containerDragBefore)}), -:is(#{c(sidebar channelDragBefore)},#{c(sidebar channelDragAfter)}) { +:is(#{c(sidebar server dragAfter)}, #{c(sidebar server dragBefore)}), +:is(#{c(sidebar server channel dragBefore)},#{c(sidebar server channel dragAfter)}) { &:before, &:after { background: cv('colors.main'); border-radius: 0; } } -#{c(sidebar channelDragOver)} { +#{c(sidebar server channel userOver)} { &:after { background: cv('colors.main'); border-color: transparent; diff --git a/src/channels/indicators.scss b/src/channels/indicators.scss index 80cb9146..ce9b9d52 100644 --- a/src/channels/indicators.scss +++ b/src/channels/indicators.scss @@ -1,8 +1,8 @@ @use "backend" as *; /* CHANNEL INDICATORS */ -#{c(serverList unreadMention)}, -#{c(serverList mentionBar)} { +#{c(sidebar server unreadBar old unread)}, +#{c(sidebar server unreadBar old mention)} { position: relative; background: transparent; &:after { diff --git a/src/channels/privateChannels.scss b/src/channels/privateChannels.scss index 36865fb8..f6dcd96c 100644 --- a/src/channels/privateChannels.scss +++ b/src/channels/privateChannels.scss @@ -1,15 +1,15 @@ @use "backend" as *; /* PRIVATE CHANNELS */ -#{c(sidebar privateChannels)} { +#{c(sidebar private channels)} { background: transparent; - #{c(sidebar scroller)} { + #{c(sidebar private scroller)} { background: transparent; } } // HEADER -#{c(sidebar privateChannelsHeaderContainer)} { +#{c(sidebar private headerContainer)} { display: flex; align-items: center; justify-content: center; @@ -35,10 +35,10 @@ background: linear-gradient(to right, cv('colors.main') 50%, transparent); margin-left: 5px; } - #{c(sidebar privateChannelsHeader)} { + #{c(sidebar private headerText)} { overflow: visible; } - #{c(sidebar privateChannelRecipientsInviteButtonIcon)} { + #{c(sidebar private inviteButtonIcon)} { color: cv('colors.main'); transition: all 0.1s ease-in-out; &:hover { @@ -48,10 +48,10 @@ } // PRIVATE CHANNEL -#{c(sidebar privateChannel)} { +#{c(sidebar private channel)} { max-width: none; } -#{c(sidebar privateChannelInteractive2)} { +#{c(sidebar private interactive)} { position: relative; z-index: 1; &:before { @@ -73,21 +73,21 @@ z-index: -1; pointer-events: none; } - #{c(other cv privateChannelIcon)}, - #{c(sidebar privateChannelName)} { + #{c(sidebar private linkButtonIcon)}, + #{c(sidebar private name)} { color: rgba(255, 255, 255, 0.4); font-size: 14px; transition: all 0.15s ease-in-out; overflow: hidden; } - #{c(other cv privateChannelActivityText)} { + #{c(sidebar private activityText)} { strong { color: cv('colors.main'); font-weight: 700; transition: all 0.15s ease-in-out; } } - #{c(other cv privateChannelCloseButton)} { + #{c(sidebar private closeButton)} { color: #fff; } @@ -97,11 +97,11 @@ &:before { background: hsla(0, 0%, 100%, 0.1); } - #{c(other cv privateChannelIcon)}, - #{c(sidebar privateChannelName)} { + #{c(sidebar private linkButtonIcon)}, + #{c(sidebar private name)} { color: hsla(0, 0%, 100%, 0.7); } - #{c(other cv privateChannelCloseButton)} { + #{c(sidebar private closeButton)} { opacity: 0.3; &:hover { opacity: 0.7; @@ -110,7 +110,7 @@ } // SELECTED - &#{c(sidebar privateChannelInteractiveSelected)} { + &#{c(sidebar private interactiveSelected)} { background: transparent; &:before { background: hsla(0, 0%, 100%, 0.1); @@ -120,20 +120,20 @@ background: cv('colors.main'); animation: cv-channel-select 0.3s ease-in-out; } - #{c(other cv privateChannelIcon)}, - #{c(sidebar privateChannelName)} { + #{c(sidebar private linkButtonIcon)}, + #{c(sidebar private name)} { color: #fff; } - #{c(other cv privateChannelActivityEmoji)}, + #{c(sidebar private activityEmoji)}, #{c(other cv privateChannelActivityIcon)} { filter: drop-shadow(0 0 3px rgba(0, 0, 0, 0.7)); } - #{c(other cv privateChannelActivityText)} { + #{c(sidebar private activityText)} { strong { color: #fff; } } - #{c(other cv privateChannelCloseButton)} { + #{c(sidebar private closeButton)} { opacity: 0.7; &:hover { opacity: 1; @@ -142,8 +142,8 @@ } // HIGHLIGHT - #{c(sidebar privateChannelHighlighted)} { - #{c(sidebar privateChannelName)} { + #{c(sidebar private highlighted)} { + #{c(sidebar private name)} { color: #fff; } } @@ -155,13 +155,13 @@ } // EMPTY PRIVATE CHANNEL -#{c(sidebar privateChannelLoadingEmpty)} { +#{c(sidebar private loadingEmpty)} { fill: hsla(0, 0%, 100%, 0.15); } // PRIVATE CHANNELS SEARCH BAR -#{c(sidebar searchBar)} { - #{c(sidebar searchBarComponent)} { +#{c(sidebar private searchBar)} { + #{c(sidebar private searchBarComponent)} { background: hsla(0, 0%, 100%, 0.1); color: hsla(0, 0%, 100%, 0.3); } diff --git a/src/chat/bars.scss b/src/chat/bars.scss index bf273885..96361461 100644 --- a/src/chat/bars.scss +++ b/src/chat/bars.scss @@ -80,7 +80,7 @@ } // BRAND -#{c(serverList unreadMention2Bar)} { +#{c(sidebar server unreadBar bar)} { background-color: cv('colors.main'); > * { color: #fff !important; diff --git a/src/chat/stageCall.scss b/src/chat/stageCall.scss index 8d75cbc2..478b7b9d 100644 --- a/src/chat/stageCall.scss +++ b/src/chat/stageCall.scss @@ -43,11 +43,11 @@ } // THE AUDIENCE CONTAINER IN VC CHANNELS -#{c(sidebar voiceUser)} { +#{c(sidebar server channel voice user)} { padding-top: 4px; } -#{c(sidebar voiceUserOverlap)} { - #{c(sidebar voiceAvatar)} { +#{c(sidebar server channel voice overlap)} { + #{c(sidebar server channel voice avatar)} { border: none; } } diff --git a/src/general/badge.scss b/src/general/badge.scss index f5552425..49af2cd0 100644 --- a/src/general/badge.scss +++ b/src/general/badge.scss @@ -14,8 +14,8 @@ font-size: 12px; line-height: 12px; } -#{c(sidebar channelModeSelected)}, -#{c(sidebar privateChannelInteractiveSelected)}, +#{c(sidebar server channel modeSelected)}, +#{c(sidebar private interactiveSelected)}, #{c(tab selected)} { #{c(serverList numberBadge)}, #{c(other cv textBadge)} { @@ -27,12 +27,12 @@ } // FLOWER STAR BADGE -#{c(other cv flowerStarContainer)} { +#{c(flowerStar container)} { color: cv('colors.main'); #{c(other cv flowerStarIcon)} { color: #fff; } - #{c(other cv flowerStarChild)} { + #{c(flowerStar childContainer)} { > svg { color: #fff; } @@ -44,7 +44,7 @@ } // COMMUNITY GUILD BADGE -#{c(other cv guildIconChildContainer)} path[fill='var(--primary-500)'] { +#{c(flowerStar redesignIconChildContainer)} path[fill='var(--primary-500)'] { fill: hsla(0, 0%, 0%, 0.9); } diff --git a/src/profiles/userProfiles.scss b/src/profiles/userProfiles.scss index cea6fafc..c43333ff 100644 --- a/src/profiles/userProfiles.scss +++ b/src/profiles/userProfiles.scss @@ -111,10 +111,10 @@ background: url(https://clearvision.github.io/icons/verified.svg) center/18px no-repeat; opacity: 0.5; z-index: 1; - #{c(other cv flowerStar)} { + #{c(flowerStar flowerStar)} { opacity: 0; } - #{c(other cv flowerStarChild)} { + #{c(flowerStar childContainer)} { display: none; } } diff --git a/src/users/avatar.scss b/src/users/avatar.scss index 146dea2e..09046c57 100644 --- a/src/users/avatar.scss +++ b/src/users/avatar.scss @@ -1,6 +1,6 @@ @use "backend" as *; /* AVATAR */ -#{c(memberList avatarMask)} { +#{c(avatar mask)} { filter: drop-shadow(0 0 5px rgba(0, 0, 0, 0.5)); } diff --git a/src/users/status.scss b/src/users/status.scss index 96a6e03c..f6329499 100644 --- a/src/users/status.scss +++ b/src/users/status.scss @@ -21,7 +21,7 @@ } /*member list, profile*/ -:is(#{c(other cv avatarCursorDefault)}, #{c(memberList avatarMask)}, #{c(other cv userSettingsProfilesPreviewStatus)}) rect { +:is(#{c(avatar cursorDefault)}, #{c(avatar mask)}, #{c(other cv userSettingsProfilesPreviewStatus)}) rect { &[fill*='#80848e'] { fill: var(--offline-color); }