Skip to content

feat(actionbutton): use closer to s2 colors in spectrum-two theme #3606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 11, 2025
Merged

feat(actionbutton): use closer to s2 colors in spectrum-two theme #3606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b09f836
feat(actionbutton): use closer to s2 colors in spectrum-two theme
jawinn Mar 5, 2025
d55d6c0
fix(actionbutton): fix high contrast styles for selected disabled
jawinn Mar 6, 2025
66c8e5b
fix(actionbutton): use s2 background colors per updated request
jawinn Mar 11, 2025
f6d73b2
chore(actionbutton): add changeset for colors update
jawinn Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .changeset/tall-pens-lay.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@spectrum-css/actionbutton": patch
---

This updates the colors used in action button for the spectrum two theme, so they are closer
aligned with the spectrum 2 spec, per the request in SWC-597. This removes the border by making
it transparent and updates the background color tokens that are used.

This also includes a forced-colors/high contrast mode fix for the selected + disabled state. This
now shows the disabled colors.
20 changes: 6 additions & 14 deletions components/actionbutton/dist/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,10 @@
"--spectrum-corner-radius-medium-size-medium",
"--spectrum-corner-radius-medium-size-small",
"--spectrum-disabled-background-color",
"--spectrum-disabled-border-color",
"--spectrum-disabled-content-color",
"--spectrum-disabled-static-black-background-color",
"--spectrum-disabled-static-black-border-color",
"--spectrum-disabled-static-black-content-color",
"--spectrum-disabled-static-white-background-color",
"--spectrum-disabled-static-white-border-color",
"--spectrum-disabled-static-white-content-color",
"--spectrum-focus-indicator-color",
"--spectrum-focus-indicator-gap",
Expand All @@ -194,10 +191,7 @@
"--spectrum-font-size-75",
"--spectrum-gray-100",
"--spectrum-gray-200",
"--spectrum-gray-400",
"--spectrum-gray-50",
"--spectrum-gray-500",
"--spectrum-gray-600",
"--spectrum-line-height-100",
"--spectrum-logical-rotation",
"--spectrum-neutral-background-color-selected-default",
Expand All @@ -216,16 +210,12 @@
"--spectrum-text-to-visual-300",
"--spectrum-text-to-visual-50",
"--spectrum-text-to-visual-75",
"--spectrum-transparent-black-400",
"--spectrum-transparent-black-500",
"--spectrum-transparent-black-600",
"--spectrum-transparent-black-700",
"--spectrum-transparent-black-100",
"--spectrum-transparent-black-200",
"--spectrum-transparent-black-800",
"--spectrum-transparent-black-900",
"--spectrum-transparent-white-400",
"--spectrum-transparent-white-500",
"--spectrum-transparent-white-600",
"--spectrum-transparent-white-700",
"--spectrum-transparent-white-100",
"--spectrum-transparent-white-200",
"--spectrum-transparent-white-800",
"--spectrum-transparent-white-900",
"--spectrum-white",
Expand Down Expand Up @@ -269,6 +259,7 @@
"--system-action-button-static-black-background-color-hover",
"--system-action-button-static-black-background-color-selected-disabled",
"--system-action-button-static-black-border-color-default",
"--system-action-button-static-black-border-color-disabled",
"--system-action-button-static-black-border-color-down",
"--system-action-button-static-black-border-color-focus",
"--system-action-button-static-black-border-color-hover",
Expand All @@ -284,6 +275,7 @@
"--system-action-button-static-white-background-color-hover",
"--system-action-button-static-white-background-color-selected-disabled",
"--system-action-button-static-white-border-color-default",
"--system-action-button-static-white-border-color-disabled",
"--system-action-button-static-white-border-color-down",
"--system-action-button-static-white-border-color-focus",
"--system-action-button-static-white-border-color-hover",
Expand Down
20 changes: 7 additions & 13 deletions components/actionbutton/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,6 @@
forced-color-adjust: none;
}

&:disabled,
&.is-disabled {
--highcontrast-actionbutton-content-color: GrayText;
--highcontrast-actionbutton-border-color: GrayText;
--highcontrast-actionbutton-background-color: ButtonFace;
}

&.is-selected {
--highcontrast-actionbutton-background-color: Highlight;
--highcontrast-actionbutton-border-color: HighlightText;
Expand All @@ -45,6 +38,13 @@
forced-color-adjust: none;
}
}

&:disabled,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a great move to ensure disabled styles always take precedence over other states. I can see that this is why the disabled+selected variant is now showing disabled colors in high contrast mode. Great job here.

&.is-disabled {
--highcontrast-actionbutton-content-color: GrayText;
--highcontrast-actionbutton-border-color: GrayText;
--highcontrast-actionbutton-background-color: ButtonFace;
}
}
}

Expand Down Expand Up @@ -87,9 +87,6 @@
--mod-actionbutton-background-color-down-selected: var(--spectrum-transparent-black-900);
--mod-actionbutton-background-color-focus-selected: var(--spectrum-transparent-black-900);

/* border color _not_ disabled is coming from the system theme layer */
--mod-actionbutton-border-color-disabled: var(--spectrum-disabled-static-black-border-color);

--mod-actionbutton-content-color-default: var(--spectrum-black);
--mod-actionbutton-content-color-hover: var(--spectrum-black);
--mod-actionbutton-content-color-down: var(--spectrum-black);
Expand All @@ -111,9 +108,6 @@
--mod-actionbutton-background-color-down-selected: var(--spectrum-transparent-white-900);
--mod-actionbutton-background-color-focus-selected: var(--spectrum-transparent-white-900);

/* border color _not_ disabled is coming from the system theme layer */
--mod-actionbutton-border-color-disabled: var(--spectrum-disabled-static-white-border-color);

--mod-actionbutton-content-color-default: var(--spectrum-white);
--mod-actionbutton-content-color-hover: var(--spectrum-white);
--mod-actionbutton-content-color-down: var(--spectrum-white);
Expand Down
62 changes: 36 additions & 26 deletions components/actionbutton/themes/spectrum-two.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@

@container style(--system: spectrum) {
.spectrum-ActionButton {
--spectrum-actionbutton-background-color-default: var(--spectrum-gray-50);
--spectrum-actionbutton-background-color-hover: var(--spectrum-gray-100);
--spectrum-actionbutton-background-color-default: var(--spectrum-gray-100);
--spectrum-actionbutton-background-color-hover: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-down: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-focus: var(--spectrum-gray-100);
--spectrum-actionbutton-background-color-focus: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-disabled: var(--spectrum-disabled-background-color);

--spectrum-actionbutton-background-color-selected: var(--spectrum-neutral-background-color-selected-default);
--spectrum-actionbutton-background-color-selected-hover: var(--spectrum-neutral-background-color-selected-hover);
--spectrum-actionbutton-background-color-selected-down: var(--spectrum-neutral-background-color-selected-down);
--spectrum-actionbutton-background-color-selected-focus: var(--spectrum-neutral-background-color-selected-key-focus);

--spectrum-actionbutton-border-color-default: var(--spectrum-gray-400);
--spectrum-actionbutton-border-color-hover: var(--spectrum-gray-500);
--spectrum-actionbutton-border-color-down: var(--spectrum-gray-600);
--spectrum-actionbutton-border-color-focus: var(--spectrum-gray-500);
--spectrum-actionbutton-border-color-disabled: var(--spectrum-disabled-border-color);
--spectrum-actionbutton-border-color-default: transparent;
--spectrum-actionbutton-border-color-hover: transparent;
--spectrum-actionbutton-border-color-down: transparent;
--spectrum-actionbutton-border-color-focus: transparent;
--spectrum-actionbutton-border-color-disabled: transparent;

--spectrum-actionbutton-content-color-selected: var(--spectrum-gray-50);

Expand All @@ -54,47 +54,57 @@

&.spectrum-ActionButton--quiet {
--spectrum-actionbutton-background-color-default: transparent;
--spectrum-actionbutton-background-color-hover: var(--spectrum-gray-100);
--spectrum-actionbutton-background-color-hover: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-down: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-focus: var(--spectrum-gray-100);
--spectrum-actionbutton-background-color-focus: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-disabled: transparent;
--spectrum-actionbutton-background-color-selected-disabled: var(--spectrum-disabled-background-color);
}

&.spectrum-ActionButton--staticBlack {
--spectrum-actionbutton-border-color-default: var(--spectrum-transparent-black-500);
--spectrum-actionbutton-border-color-hover: var(--spectrum-transparent-black-600);
--spectrum-actionbutton-border-color-down: var(--spectrum-transparent-black-700);
--spectrum-actionbutton-border-color-focus: var(--spectrum-transparent-black-600);
--spectrum-actionbutton-border-color-default: transparent;
--spectrum-actionbutton-border-color-hover: transparent;
--spectrum-actionbutton-border-color-down: transparent;
--spectrum-actionbutton-border-color-focus: transparent;
--spectrum-actionbutton-border-color-disabled: transparent;

--spectrum-actionbutton-background-color-disabled: var(--spectrum-disabled-static-black-background-color);
--spectrum-actionbutton-background-color-selected-disabled: var(--spectrum-disabled-static-black-background-color);

&,
--spectrum-actionbutton-background-color-default: var(--spectrum-transparent-black-100);
--spectrum-actionbutton-background-color-hover: var(--spectrum-transparent-black-200);
--spectrum-actionbutton-background-color-down: var(--spectrum-transparent-black-200);
--spectrum-actionbutton-background-color-focus: var(--spectrum-transparent-black-200);

&.spectrum-ActionButton--quiet {
--spectrum-actionbutton-background-color-default: transparent;
--spectrum-actionbutton-background-color-hover: var(--spectrum-transparent-black-400);
--spectrum-actionbutton-background-color-down: var(--spectrum-transparent-black-500);
--spectrum-actionbutton-background-color-focus: var(--spectrum-transparent-black-400);
--spectrum-actionbutton-background-color-hover: var(--spectrum-transparent-black-200);
--spectrum-actionbutton-background-color-down: var(--spectrum-transparent-black-200);
--spectrum-actionbutton-background-color-focus: var(--spectrum-transparent-black-200);
--spectrum-actionbutton-background-color-disabled: transparent;
}
}

&.spectrum-ActionButton--staticWhite {
--spectrum-actionbutton-border-color-default: var(--spectrum-transparent-white-500);
--spectrum-actionbutton-border-color-hover: var(--spectrum-transparent-white-600);
--spectrum-actionbutton-border-color-down: var(--spectrum-transparent-white-700);
--spectrum-actionbutton-border-color-focus: var(--spectrum-transparent-white-600);
--spectrum-actionbutton-border-color-default: transparent;
--spectrum-actionbutton-border-color-hover: transparent;
--spectrum-actionbutton-border-color-down: transparent;
--spectrum-actionbutton-border-color-focus: transparent;
--spectrum-actionbutton-border-color-disabled: transparent;

--spectrum-actionbutton-background-color-disabled: var(--spectrum-disabled-static-white-background-color);
--spectrum-actionbutton-background-color-selected-disabled: var(--spectrum-disabled-static-white-background-color);

&,
--spectrum-actionbutton-background-color-default: var(--spectrum-transparent-white-100);
--spectrum-actionbutton-background-color-hover: var(--spectrum-transparent-white-200);
--spectrum-actionbutton-background-color-down: var(--spectrum-transparent-white-200);
--spectrum-actionbutton-background-color-focus: var(--spectrum-transparent-white-200);

&.spectrum-ActionButton--quiet {
--spectrum-actionbutton-background-color-default: transparent;
--spectrum-actionbutton-background-color-hover: var(--spectrum-transparent-white-400);
--spectrum-actionbutton-background-color-down: var(--spectrum-transparent-white-500);
--spectrum-actionbutton-background-color-focus: var(--spectrum-transparent-white-400);
--spectrum-actionbutton-background-color-hover: var(--spectrum-transparent-white-200);
--spectrum-actionbutton-background-color-down: var(--spectrum-transparent-white-200);
--spectrum-actionbutton-background-color-focus: var(--spectrum-transparent-white-200);
--spectrum-actionbutton-background-color-disabled: transparent;
}
}
Expand Down
26 changes: 24 additions & 2 deletions components/actionbutton/themes/spectrum.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
--spectrum-actionbutton-background-color-disabled: transparent;
--spectrum-actionbutton-background-color-selected-disabled: var(--spectrum-disabled-background-color);

--spectrum-actionbutton-border-color-default: var(--spectrum-gray-400);
--spectrum-actionbutton-border-color-hover: var(--spectrum-gray-500);
--spectrum-actionbutton-border-color-down: var(--spectrum-gray-600);
--spectrum-actionbutton-border-color-focus: var(--spectrum-gray-500);
--spectrum-actionbutton-border-color-disabled: var(--spectrum-disabled-border-color);

--spectrum-actionbutton-content-color-selected: var(--spectrum-gray-75);

&.spectrum-ActionButton--sizeXS,
Expand All @@ -45,12 +51,20 @@
--spectrum-actionbutton-border-color-hover: var(--spectrum-transparent-black-500);
--spectrum-actionbutton-border-color-down: var(--spectrum-transparent-black-600);
--spectrum-actionbutton-border-color-focus: var(--spectrum-transparent-black-500);
--spectrum-actionbutton-border-color-disabled: var(--spectrum-disabled-static-black-border-color);

--spectrum-actionbutton-background-color-default: transparent;
--spectrum-actionbutton-background-color-hover: var(--spectrum-transparent-black-300);
--spectrum-actionbutton-background-color-down: var(--spectrum-transparent-black-400);
--spectrum-actionbutton-background-color-focus: var(--spectrum-transparent-black-300);
--spectrum-actionbutton-background-color-disabled: transparent;

&,
&.spectrum-ActionButton--quiet {
--spectrum-actionbutton-background-color-default: transparent;
--spectrum-actionbutton-background-color-hover: var(--spectrum-transparent-black-300);
--spectrum-actionbutton-background-color-down: var(--spectrum-transparent-black-400);
--spectrum-actionbutton-background-color-focus: var(--spectrum-transparent-black-300);
--spectrum-actionbutton-background-color-disabled: transparent;
}
}

Expand All @@ -59,12 +73,20 @@
--spectrum-actionbutton-border-color-hover: var(--spectrum-transparent-white-500);
--spectrum-actionbutton-border-color-down: var(--spectrum-transparent-white-600);
--spectrum-actionbutton-border-color-focus: var(--spectrum-transparent-white-500);
--spectrum-actionbutton-border-color-disabled: var(--spectrum-disabled-static-white-border-color);

--spectrum-actionbutton-background-color-default: transparent;
--spectrum-actionbutton-background-color-hover: var(--spectrum-transparent-white-300);
--spectrum-actionbutton-background-color-down: var(--spectrum-transparent-white-400);
--spectrum-actionbutton-background-color-focus: var(--spectrum-transparent-white-300);
--spectrum-actionbutton-background-color-disabled: transparent;

&,
&.spectrum-ActionButton--quiet {
--spectrum-actionbutton-background-color-default: transparent;
--spectrum-actionbutton-background-color-hover: var(--spectrum-transparent-white-300);
--spectrum-actionbutton-background-color-down: var(--spectrum-transparent-white-400);
--spectrum-actionbutton-background-color-focus: var(--spectrum-transparent-white-300);
--spectrum-actionbutton-background-color-disabled: transparent;
}
}
}
Expand Down
Loading