Skip to content

Commit c1c58f6

Browse files
authored
fix: unhovered focused menu text + reply bar with threads + channels & roles hover + actually theme matchingPostsRow (#328)
* fix unhovered focused menu text * fix reply bar with threads + channels & roles hover * actually theme matchingPostsRow * variable moment * fix account switch hover + distinguish user popout message box * fix nitro thought bubbles being themed over * update attachedBars new name
1 parent a5e483b commit c1c58f6

File tree

3 files changed

+34
-130
lines changed

3 files changed

+34
-130
lines changed

src/components/_chat.scss

+15-35
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@
1414
}
1515

1616
// reply bar
17-
[class^="attachedBars_"] {
18-
background: $crust;
19-
20-
[class^="replyBar_"] {
21-
background: $crust;
22-
}
17+
[class^="attachedBars_"], [class^="stackedBars_"] {
18+
--background-secondary: $crust;
2319
}
2420

2521
// text input area
@@ -555,42 +551,26 @@ div[class*="giftCodeContainer"] [class*="tile"] {
555551
div[class*="chat_"] {
556552
div[class*="content_"][class*="container_"] {
557553
// customise
558-
div[class^="profileCard_"] {
559-
background-color: $surface0;
560-
div[class^="role_"] {
561-
background-color: $mantle;
562-
}
563-
}
564-
565-
div[class^="prompt_"] {
566-
background-color: $surface0;
567-
div[class^="optionButtonWrapper_"][class*="selected_"] {
568-
background-color: $mantle;
569-
border-color: $mantle;
570-
}
571-
div[class^="select_"] {
572-
div[class$="control"] {
573-
background-color: $mantle;
574-
border-color: $mantle;
575-
div[class^="selectValuePill_"] {
576-
background-color: $surface0;
577-
}
578-
}
579-
div[class$="menu"] {
580-
background-color: $base;
581-
border-color: $mantle;
582-
}
583-
}
584-
}
554+
--background-primary: $surface0;
555+
--background-secondary: $base; // dropdown menu
556+
--background-secondary-alt: $mantle; // roles
557+
--background-tertiary: $mantle;
558+
--input-background: $mantle;
559+
--white-500: $crust; // check icon
585560

586561
// channels
587562
div[class*="search_"] input::placeholder {
588563
color: $overlay1;
589564
}
590565
div[class^="channelRow_"] {
591-
background-color: $surface0;
592566
&:hover:not([class*="disabled_"]) {
593-
background-color: $base;
567+
background-color: $surface1;
568+
}
569+
button {
570+
border-color: $overlay0;
571+
&:hover {
572+
background-color: $overlay0;
573+
}
594574
}
595575
}
596576
}

src/components/_popouts.scss

+17-93
Original file line numberDiff line numberDiff line change
@@ -2,90 +2,28 @@ div[class^="layerContainer"] [role="menu"] {
22
// make menu items readable when hovered
33
--brand-experiment-560: var(--brand-experiment-25a);
44
--brand-experiment-600: var(--brand-experiment);
5+
--white: $crust;
6+
--white-500: $crust;
57

6-
[class*="colorDefault"] {
7-
&[class*="colorBrand"] {
8-
color: $brand;
9-
}
10-
11-
&[class*="focused"] {
12-
&:not([class*="colorDanger"]),
13-
[class*="checkbox_"] {
14-
color: var(--interactive-normal);
15-
}
16-
}
17-
18-
&[role="menuitem"]:not(
19-
[class*="colorDanger"],
20-
[id*="user-context-user-volume"]
21-
):hover {
22-
&:not([class*="colorPremiumGradient"]) {
23-
background: var(--background-accent);
24-
}
25-
26-
color: $crust;
27-
28-
[class*="subtext"],
29-
[class*="caret_"] {
30-
color: $crust;
31-
}
32-
}
33-
34-
[class*="caret"] {
35-
color: $text;
36-
}
8+
// make active items have dark text
9+
[class*="colorDefault"]:active:not([class*="hideInteraction_"]) {
10+
color: var(--background-floating);
3711

38-
&:hover [class*="caret"] {
39-
color: $crust;
12+
[class*="check_"] {
13+
color: var(--interactive-normal);
4014
}
4115

42-
// make active items have dark text
43-
&:active:not([class*="hideInteraction_"]) {
16+
[class*="checkbox_"] {
4417
color: var(--background-floating);
45-
46-
[class*="check_"] {
47-
color: var(--interactive-normal);
48-
}
49-
50-
[class*="checkbox_"] {
51-
color: var(--background-floating);
52-
}
53-
54-
[class*="colorPremiumGradient"] {
55-
background: linear-gradient(
56-
270deg,
57-
var(--premium-tier-2-pink-for-gradients) 0%,
58-
var(--premium-tier-2-pink-for-gradients-2) 33.63%,
59-
var(--premium-tier-2-purple-for-gradients) 100%
60-
);
61-
}
62-
}
63-
}
64-
65-
// Account switcher submenu
66-
div[id^="account-switch-account"] {
67-
&[class*="focused"] {
68-
div[class*="userMenuUsername"] div {
69-
color: $crust;
70-
}
71-
72-
svg[class^="activeIcon"] {
73-
circle {
74-
fill: $blue;
75-
}
76-
g path {
77-
fill: $crust;
78-
}
79-
}
8018
}
8119

82-
svg[class^="activeIcon"] {
83-
circle {
84-
fill: $crust;
85-
}
86-
g path {
87-
fill: $blue;
88-
}
20+
[class*="colorPremiumGradient"] {
21+
background: linear-gradient(
22+
270deg,
23+
var(--premium-tier-2-pink-for-gradients) 0%,
24+
var(--premium-tier-2-pink-for-gradients-2) 33.63%,
25+
var(--premium-tier-2-purple-for-gradients) 100%
26+
);
8927
}
9028
}
9129

@@ -351,14 +289,6 @@ section[class*="positionContainer_"] {
351289
}
352290

353291
div[class^="layerContainer"] {
354-
// right-click popups for guild, channels, and user
355-
#guild-header-popout,
356-
#guild-context,
357-
div[id^="channel-context"],
358-
div[id^="user-context"] {
359-
background: $crust;
360-
}
361-
362292
> div[class*="layer"] {
363293
// search popout
364294
div[role="listbox"] {
@@ -653,14 +583,8 @@ div[class*="userProfileOuter_"] {
653583
> button:nth-child(2) {
654584
background: $brand;
655585
}
656-
}
657-
658-
// Thought bubble
659-
div[class^="statusBubbleOuter"] {
660-
&:before,
661-
&:after,
662-
span[class^="statusBubble"] {
663-
background-color: $mantle;
586+
div[class^="inner_"] {
587+
--input-background: $mantle;
664588
}
665589
}
666590

src/components/_variables.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ html {
7373
--background-mobile-primary: #{$base};
7474
--background-mobile-secondary: #{$mantle};
7575
--bg-base-secondary: #{$mantle};
76-
--bg-surface-raised: #{$base};
76+
--bg-surface-raised: #{$mantle};
7777

7878
--home-background: #{$base};
7979
--chat-background: #{$base};
@@ -273,7 +273,7 @@ html {
273273
--deprecated-card-editable-bg: #{adjust-color($crust, $alpha: -0.7)};
274274

275275
--bg-mod-faint: #{$mantle};
276-
--bg-mod-subtle: #{surface1};
276+
--bg-mod-subtle: #{$surface1};
277277

278278
--deprecated-store-bg: #{$base};
279279
--deprecated-quickswitcher-input-background: #{darken(

0 commit comments

Comments
 (0)