Skip to content

Commit 8e52975

Browse files
fix(button): primary, secondary color fast follows (#3648)
1 parent 9950a1c commit 8e52975

File tree

5 files changed

+24
-9
lines changed

5 files changed

+24
-9
lines changed

.changeset/nine-eggs-count.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"@spectrum-css/button": patch
3+
---
4+
5+
S2 Foundations fixes to adjust:
6+
7+
- primary outline background color for hover, active, and focus states (gray-100)
8+
- secondary fill background color for active state (gray-200)
9+
- secondary outline background color for hover, active, and focus states (gray-100)
10+
- secondary outline border color for default (gray-300) and active states (gray-400)

components/button/dist/metadata.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@
318318
"--system-button-secondary-outline-background-color-focus",
319319
"--system-button-secondary-outline-background-color-hover",
320320
"--system-button-secondary-outline-border-color-default",
321+
"--system-button-secondary-outline-border-color-down",
321322
"--system-button-selected-background-color-default",
322323
"--system-button-selected-background-color-down",
323324
"--system-button-selected-background-color-focus",

components/button/index.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@
220220

221221
--mod-button-border-color-default: var(--spectrum-gray-300);
222222
--mod-button-border-color-hover: var(--spectrum-gray-400);
223-
--mod-button-border-color-down: var(--spectrum-gray-500);
224223
--mod-button-border-color-focus: var(--spectrum-gray-400);
225224
--mod-button-border-color-disabled: var(--spectrum-disabled-border-color);
226225

components/button/themes/spectrum-two.css

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
--mod-button-content-color-focus: var(--spectrum-gray-25);
4141

4242
&.spectrum-Button--outline {
43-
--mod-button-background-color-hover: var(--spectrum-gray-200);
44-
--mod-button-background-color-down: var(--spectrum-gray-400);
45-
--mod-button-background-color-focus: var(--spectrum-gray-200);
43+
--mod-button-background-color-hover: var(--spectrum-gray-100);
44+
--mod-button-background-color-down: var(--spectrum-gray-100);
45+
--mod-button-background-color-focus: var(--spectrum-gray-100);
4646
}
4747
}
4848

@@ -51,16 +51,17 @@
5151

5252
&:not(.spectrum-Button--outline) {
5353
--mod-button-background-color-hover: var(--spectrum-gray-200);
54-
--mod-button-background-color-down: var(--spectrum-gray-400);
54+
--mod-button-background-color-down: var(--spectrum-gray-200);
5555
--mod-button-background-color-focus: var(--spectrum-gray-200);
5656
}
5757

5858
&.spectrum-Button--outline {
59-
--mod-button-background-color-hover: var(--spectrum-gray-200);
60-
--mod-button-background-color-down: var(--spectrum-gray-400);
61-
--mod-button-background-color-focus: var(--spectrum-gray-200);
59+
--mod-button-background-color-hover: var(--spectrum-gray-100);
60+
--mod-button-background-color-down: var(--spectrum-gray-100);
61+
--mod-button-background-color-focus: var(--spectrum-gray-100);
6262

63-
--mod-button-border-color-default: var(--spectrum-gray-200);
63+
--mod-button-border-color-default: var(--spectrum-gray-300);
64+
--mod-button-border-color-down: var(--spectrum-gray-400);
6465
}
6566
}
6667

components/button/themes/spectrum.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
&.spectrum-Button--outline {
3232
--mod-button-background-color-hover: var(--spectrum-gray-300);
33+
--mod-button-background-color-down: var(--spectrum-gray-400);
3334
--mod-button-background-color-focus: var(--spectrum-gray-300);
3435
}
3536
}
@@ -39,14 +40,17 @@
3940

4041
&:not(.spectrum-Button--outline) {
4142
--mod-button-background-color-hover: var(--spectrum-gray-300);
43+
--mod-button-background-color-down: var(--spectrum-gray-400);
4244
--mod-button-background-color-focus: var(--spectrum-gray-300);
4345
}
4446

4547
&.spectrum-Button--outline {
4648
--mod-button-background-color-hover: var(--spectrum-gray-300);
49+
--mod-button-background-color-down: var(--spectrum-gray-400);
4750
--mod-button-background-color-focus: var(--spectrum-gray-300);
4851

4952
--mod-button-border-color-default: var(--spectrum-gray-300);
53+
--mod-button-border-color-down: var(--spectrum-gray-500);
5054
}
5155
}
5256

0 commit comments

Comments
 (0)