Skip to content

Commit 19f6bba

Browse files
committed
Revert "fix(*): scope actionbuttion quiet background mod to cases where it's not is-selected"
This reverts commit bc72ba7.
1 parent 80efedc commit 19f6bba

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

components/actionbutton/index.css

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,21 @@
1616
--spectrum-actionbutton-background-color-hover: var(--highcontrast-actionbutton-background-color-hover, var(--mod-actionbutton-background-color-hover, var(--spectrum-gray-100)));
1717
--spectrum-actionbutton-background-color-down: var(--highcontrast-actionbutton-background-color-down, var(--mod-actionbutton-background-color-down, var(--spectrum-gray-200)));
1818
--spectrum-actionbutton-background-color-focus: var(--highcontrast-actionbutton-background-color-focus, var(--mod-actionbutton-background-color-focus, var(--spectrum-gray-100)));
19-
--spectrum-actionbutton-background-color-selected-disabled: var(--spectrum-transparent-black-100);
20-
21-
--spectrum-actionbutton-background-color-selected: var(--spectrum-neutral-background-color-selected-default);
22-
--spectrum-actionbutton-background-color-selected-hover: var(--spectrum-neutral-background-color-selected-hover);
23-
--spectrum-actionbutton-background-color-selected-down: var(--spectrum-neutral-background-color-selected-down);
24-
--spectrum-actionbutton-background-color-selected-focus: var(--spectrum-neutral-background-color-selected-key-focus);
2519

2620
--spectrum-actionbutton-border-color-default: var(--highcontrast-actionbutton-border-color-default, var(--mod-actionbutton-border-color-default, var(--spectrum-gray-400)));
2721
--spectrum-actionbutton-border-color-hover: var(--highcontrast-actionbutton-border-color-hover, var(--mod-actionbutton-border-color-hover, var(--spectrum-gray-500)));
2822
--spectrum-actionbutton-border-color-down: var(--highcontrast-actionbutton-border-color-down, var(--mod-actionbutton-border-color-down, var(--spectrum-gray-600)));
2923
--spectrum-actionbutton-border-color-focus: var(--highcontrast-actionbutton-border-color-focus, var(--mod-actionbutton-border-color-focus, var(--spectrum-gray-500)));
3024
--spectrum-actionbutton-border-color-disabled: var(--spectrum-disabled-border-color);
3125

32-
--spectrum-actionbutton-content-color-selected: var(--spectrum-gray-50);
26+
--spectrum-actionbutton-background-color-selected-disabled: var(--spectrum-transparent-black-100);
3327
--spectrum-actionbutton-content-color-disabled: var(--spectrum-disabled-content-color);
3428

29+
--spectrum-actionbutton-background-color-selected: var(--spectrum-neutral-background-color-selected-default);
30+
--spectrum-actionbutton-background-color-selected-hover: var(--spectrum-neutral-background-color-selected-hover);
31+
--spectrum-actionbutton-background-color-selected-down: var(--spectrum-neutral-background-color-selected-down);
32+
--spectrum-actionbutton-background-color-selected-focus: var(--spectrum-neutral-background-color-selected-key-focus);
33+
3534
--spectrum-actionbutton-animation-duration: var(--mod-actionbutton-animation-duration, var(--spectrum-animation-duration-100));
3635
--spectrum-actionbutton-border-radius: var(--mod-actionbutton-border-radius, var(--spectrum-corner-radius-medium-size-medium));
3736
--spectrum-actionbutton-border-width: var(--mod-actionbutton-border-width, var(--spectrum-border-width-100));
@@ -62,9 +61,7 @@
6261
}
6362

6463
&.spectrum-ActionButton--quiet {
65-
&:not(.is-selected) {
66-
--mod-actionbutton-background-color-default: transparent;
67-
}
64+
--mod-actionbutton-background-color-default: transparent;
6865
--mod-actionbutton-background-color-hover: var(--spectrum-gray-100);
6966
--mod-actionbutton-background-color-down: var(--spectrum-gray-200);
7067
--mod-actionbutton-background-color-focus: var(--spectrum-gray-100);
@@ -77,10 +74,10 @@
7774
--mod-actionbutton-border-color-focus: var(--spectrum-transparent-black-600);
7875

7976
--spectrum-actionbutton-background-color-disabled: transparent;
80-
--spectrum-actionbutton-background-color-selected-disabled: var(--spectrum-transparent-black-200);
8177

8278
&,
8379
&.spectrum-ActionButton--quiet {
80+
--mod-actionbutton-background-color-default: transparent;
8481
--mod-actionbutton-background-color-hover: var(--spectrum-transparent-black-400);
8582
--mod-actionbutton-background-color-down: var(--spectrum-transparent-black-500);
8683
--mod-actionbutton-background-color-focus: var(--spectrum-transparent-black-400);
@@ -98,6 +95,7 @@
9895

9996
&,
10097
&.spectrum-ActionButton--quiet {
98+
--mod-actionbutton-background-color-default: transparent;
10199
--mod-actionbutton-background-color-hover: var(--spectrum-transparent-white-400);
102100
--mod-actionbutton-background-color-down: var(--spectrum-transparent-white-500);
103101
--mod-actionbutton-background-color-focus: var(--spectrum-transparent-white-400);
@@ -111,10 +109,16 @@
111109
--mod-actionbutton-background-color-focus: var(--mod-actionbutton-background-color-focus-selected, var(--spectrum-actionbutton-background-color-selected-focus));
112110
--mod-actionbutton-background-color-disabled: var(--spectrum-actionbutton-background-color-selected-disabled);
113111

114-
--mod-actionbutton-content-color-default: var(--mod-actionbutton-content-color-default-selected, var(--spectrum-actionbutton-content-color-selected));
115-
--mod-actionbutton-content-color-hover: var(--mod-actionbutton-content-color-hover-selected, var(--spectrum-actionbutton-content-color-selected));
116-
--mod-actionbutton-content-color-down: var(--mod-actionbutton-content-color-down-selected, var(--spectrum-actionbutton-content-color-selected));
117-
--mod-actionbutton-content-color-focus: var(--mod-actionbutton-content-color-focus-selected, var(--spectrum-actionbutton-content-color-selected));
112+
--mod-actionbutton-content-color-default: var(--mod-actionbutton-content-color-default-selected, var(--spectrum-gray-25));
113+
--mod-actionbutton-content-color-hover: var(--mod-actionbutton-content-color-hover-selected, var(--spectrum-gray-25));
114+
--mod-actionbutton-content-color-down: var(--mod-actionbutton-content-color-down-selected, var(--spectrum-gray-25));
115+
--mod-actionbutton-content-color-focus: var(--mod-actionbutton-content-color-focus-selected, var(--spectrum-gray-25));
116+
117+
--mod-actionbutton-border-color-default: transparent;
118+
--mod-actionbutton-border-color-hover: transparent;
119+
--mod-actionbutton-border-color-down: transparent;
120+
--mod-actionbutton-border-color-focus: transparent;
121+
--mod-actionbutton-border-color-disabled: transparent;
118122

119123
&.spectrum-ActionButton--emphasized {
120124
--mod-actionbutton-background-color-default: var(--mod-actionbutton-background-color-default-selected-emphasized, var(--spectrum-accent-background-color-default));

components/actionbutton/metadata/metadata.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
".spectrum-ActionButton.is-selected .spectrum-ActionButton-label",
2020
".spectrum-ActionButton.is-selected.spectrum-ActionButton--emphasized",
2121
".spectrum-ActionButton.spectrum-ActionButton--quiet",
22-
".spectrum-ActionButton.spectrum-ActionButton--quiet:not(.is-selected)",
2322
".spectrum-ActionButton.spectrum-ActionButton--staticBlack",
2423
".spectrum-ActionButton.spectrum-ActionButton--staticBlack.spectrum-ActionButton--quiet",
2524
".spectrum-ActionButton.spectrum-ActionButton--staticWhite",
@@ -115,7 +114,6 @@
115114
"--spectrum-actionbutton-content-color-down",
116115
"--spectrum-actionbutton-content-color-focus",
117116
"--spectrum-actionbutton-content-color-hover",
118-
"--spectrum-actionbutton-content-color-selected",
119117
"--spectrum-actionbutton-edge-to-hold-icon",
120118
"--spectrum-actionbutton-edge-to-text",
121119
"--spectrum-actionbutton-edge-to-visual",
@@ -174,6 +172,7 @@
174172
"--spectrum-font-size-75",
175173
"--spectrum-gray-100",
176174
"--spectrum-gray-200",
175+
"--spectrum-gray-25",
177176
"--spectrum-gray-400",
178177
"--spectrum-gray-50",
179178
"--spectrum-gray-500",
@@ -195,7 +194,6 @@
195194
"--spectrum-text-to-visual-50",
196195
"--spectrum-text-to-visual-75",
197196
"--spectrum-transparent-black-100",
198-
"--spectrum-transparent-black-200",
199197
"--spectrum-transparent-black-400",
200198
"--spectrum-transparent-black-500",
201199
"--spectrum-transparent-black-600",

0 commit comments

Comments
 (0)