Skip to content

Commit 712d502

Browse files
authored
Merge pull request #19975 from calixteman/fix_color_dialog_buttons
Fix the colors of disabled buttons in the dialogs
2 parents 21ef454 + de1a9e7 commit 712d502

File tree

1 file changed

+30
-9
lines changed

1 file changed

+30
-9
lines changed

web/dialog.css

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@
5151
);
5252
--button-secondary-hover-fg-color: var(--button-secondary-fg-color);
5353
--button-secondary-hover-border-color: var(--button-secondary-hover-bg-color);
54+
--button-secondary-disabled-bg-color: var(--button-secondary-bg-color);
55+
--button-secondary-disabled-border-color: var(
56+
--button-secondary-border-color
57+
);
58+
--button-secondary-disabled-fg-color: var(--button-secondary-fg-color);
5459

5560
--button-primary-bg-color: light-dark(#0060df, #0df);
5661
--button-primary-fg-color: light-dark(#fbfbfe, #15141a);
@@ -61,15 +66,17 @@
6166
--button-primary-hover-bg-color: light-dark(#0250bb, #80ebff);
6267
--button-primary-hover-fg-color: var(--button-primary-fg-color);
6368
--button-primary-hover-border-color: var(--button-primary-hover-bg-color);
64-
65-
--button-disabled-bg-color: color-mix(in srgb, currentcolor, transparent 60%);
66-
--button-disabled-fg-color: var(--button-disabled-bg-color);
69+
--button-primary-disabled-bg-color: var(--button-primary-bg-color);
70+
--button-primary-disabled-border-color: var(--button-primary-border-color);
71+
--button-primary-disabled-fg-color: var(--button-primary-fg-color);
72+
--button-disabled-opacity: 0.4;
6773

6874
--input-text-bg-color: light-dark(white, #42414d);
6975
--input-text-fg-color: var(--text-primary-color);
7076

7177
@media (prefers-color-scheme: dark) {
7278
--hover-filter: brightness(1.4);
79+
--button-disabled-opacity: 0.6;
7380
}
7481

7582
@media screen and (forced-colors: active) {
@@ -101,6 +108,8 @@
101108
--button-secondary-hover-bg-color: HighlightText;
102109
--button-secondary-hover-fg-color: SelectedItem;
103110
--button-secondary-hover-border-color: SelectedItem;
111+
--button-secondary-disabled-fg-color: GrayText;
112+
--button-secondary-disabled-border-color: GrayText;
104113

105114
--button-primary-bg-color: ButtonText;
106115
--button-primary-fg-color: HighlightText;
@@ -111,9 +120,10 @@
111120
--button-primary-hover-bg-color: SelectedItem;
112121
--button-primary-hover-fg-color: HighlightText;
113122
--button-primary-hover-border-color: SelectedItem;
114-
115-
--button-disabled-bg-color: GrayText;
116-
--button-disabled-fg-color: ButtonFace;
123+
--button-primary-disabled-bg-color: GrayText;
124+
--button-primary-disabled-fg-color: ButtonFace;
125+
--button-primary-disabled-border-color: GrayText;
126+
--button-disabled-opacity: 1;
117127

118128
--input-text-bg-color: HighlightText;
119129
--input-text-fg-color: FieldText;
@@ -249,6 +259,13 @@
249259
background-color: var(--button-secondary-active-bg-color);
250260
border-color: var(--button-secondary-active-border-color);
251261
}
262+
263+
&:disabled {
264+
background-color: var(--button-secondary-disabled-bg-color);
265+
border-color: var(--button-secondary-disabled-border-color);
266+
color: var(--button-secondary-disabled-fg-color);
267+
opacity: var(--button-disabled-opacity);
268+
}
252269
}
253270

254271
&.primaryButton {
@@ -268,12 +285,16 @@
268285
background-color: var(--button-primary-active-bg-color);
269286
border-color: var(--button-primary-active-border-color);
270287
}
288+
289+
&:disabled {
290+
background-color: var(--button-primary-disabled-bg-color);
291+
border-color: var(--button-primary-disabled-border-color);
292+
color: var(--button-primary-disabled-fg-color);
293+
opacity: var(--button-disabled-opacity);
294+
}
271295
}
272296

273297
&:disabled {
274-
color: var(--button-disabled-fg-color) !important;
275-
background-color: var(--button-disabled-bg-color);
276-
border-color: var(--button-disabled-bg-color);
277298
pointer-events: none;
278299
}
279300
}

0 commit comments

Comments
 (0)