Skip to content
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

chore: updated button to add fast follows fixes #5174

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
+189 −131
Open

chore: updated button to add fast follows fixes #5174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8dcf3e4
chore: updated button to add fast follows fixes
Mar 7, 2025
3cb0257
ci: update golden image cache
Mar 7, 2025
ac52494
Merge branch 'main' into rajdeep/button-fast-follows
Rajdeepc Mar 7, 2025
f00bebc
ci: revert golden image cache
Mar 8, 2025
122a63e
Merge branch 'rajdeep/button-fast-follows' of https://github.com/adob…
Mar 8, 2025
8fffe4d
chore: resolved merge conflicts
Mar 11, 2025
62e1231
chore: added primary variants of static black and white
Mar 11, 2025
25fbc8f
chore: added secondary to black and white
Mar 11, 2025
e16f89c
chore: button update to new release for design review fixes
Mar 13, 2025
3fa0ce0
chore: resolved conflicts
Mar 22, 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
5 changes: 5 additions & 0 deletions .changeset/olive-maps-accept.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@spectrum-web-components/button': patch
---

updated button to latest css version
2 changes: 1 addition & 1 deletion packages/button/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"@spectrum-web-components/shared": "1.3.0"
},
"devDependencies": {
"@spectrum-css/button": "14.1.1"
"@spectrum-css/button": "14.1.3"
},
"types": "./src/index.d.ts",
"customElements": "custom-elements.json",
Expand Down
15 changes: 6 additions & 9 deletions packages/button/src/button-overrides.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@ governing permissions and limitations under the License.
}

:host([static-color='white'][treatment='outline']:not([variant='secondary'])) {
--mod-button-background-color-default: var(
--system-button-static-white-outline-not-secondary-background-color-default
);
--mod-button-background-color-hover: var(
--system-button-static-white-outline-not-secondary-background-color-hover
);
Expand Down Expand Up @@ -307,15 +310,6 @@ governing permissions and limitations under the License.
}

:host([static-color='black'][variant='secondary'][treatment='outline']) {
--mod-button-background-color-hover: var(
--system-button-static-black-secondary-outline-background-color-hover
);
--mod-button-background-color-down: var(
--system-button-static-black-secondary-outline-background-color-down
);
--mod-button-background-color-focus: var(
--system-button-static-black-secondary-outline-background-color-focus
);
--mod-button-border-color-default: var(
--system-button-static-black-secondary-outline-border-color-default
);
Expand All @@ -331,6 +325,9 @@ governing permissions and limitations under the License.
}

:host([static-color='black'][treatment='outline']:not([variant='secondary'])) {
--mod-button-background-color-default: var(
--system-button-static-black-outline-not-secondary-background-color-default
);
--mod-button-background-color-hover: var(
--system-button-static-black-outline-not-secondary-background-color-hover
);
Expand Down
14 changes: 14 additions & 0 deletions packages/button/stories/button-black-fill.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ export default {
export const Default = (props: Properties): TemplateResult =>
renderButtonSet(props);

export const Primary = (props: Properties): TemplateResult =>
renderButtonSet(props);

Primary.args = {
variant: 'primary',
};

export const Secondary = (props: Properties): TemplateResult =>
renderButtonSet(props);

Secondary.args = {
variant: 'secondary',
};

export const withIcon = (props: Properties): TemplateResult =>
renderWithIcon(props);

Expand Down
14 changes: 14 additions & 0 deletions packages/button/stories/button-black-outline.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ export default {
export const Default = (props: Properties): TemplateResult =>
renderButtonSet(props);

export const Primary = (props: Properties): TemplateResult =>
renderButtonSet(props);

Primary.args = {
variant: 'primary',
};

export const Secondary = (props: Properties): TemplateResult =>
renderButtonSet(props);

Secondary.args = {
variant: 'secondary',
};

export const withIcon = (props: Properties): TemplateResult =>
renderWithIcon(props);

Expand Down
14 changes: 14 additions & 0 deletions packages/button/stories/button-white-fill.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ export default {
export const Default = (props: Properties): TemplateResult =>
renderButtonSet(props);

export const Primary = (props: Properties): TemplateResult =>
renderButtonSet(props);

Primary.args = {
variant: 'primary',
};

export const Secondary = (props: Properties): TemplateResult =>
renderButtonSet(props);

Secondary.args = {
variant: 'secondary',
};

export const withIcon = (props: Properties): TemplateResult =>
renderWithIcon(props);

Expand Down
14 changes: 14 additions & 0 deletions packages/button/stories/button-white-outline.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ export default {
export const Default = (props: Properties): TemplateResult =>
renderButtonSet(props);

export const Primary = (props: Properties): TemplateResult =>
renderButtonSet(props);

Primary.args = {
variant: 'primary',
};

export const Secondary = (props: Properties): TemplateResult =>
renderButtonSet(props);

Secondary.args = {
variant: 'secondary',
};

export const withIcon = (props: Properties): TemplateResult =>
renderWithIcon(props);

Expand Down
138 changes: 72 additions & 66 deletions tools/styles/tokens-v2/system-theme-bridge.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,192 +779,198 @@
--spectrum-gray-200
);
--system-button-static-white-background-color-default: var(
--spectrum-transparent-white-900
--spectrum-transparent-white-800
);
--system-button-static-white-background-color-hover: var(
--spectrum-transparent-white-1000
--spectrum-transparent-white-900
);
--system-button-static-white-background-color-down: var(
--spectrum-transparent-white-1000
--spectrum-transparent-white-900
);
--system-button-static-white-background-color-focus: var(
--spectrum-transparent-white-1000
--spectrum-transparent-white-900
);
--system-button-static-white-content-color-default: var(--spectrum-black);
--system-button-static-white-content-color-hover: var(--spectrum-black);
--system-button-static-white-content-color-down: var(--spectrum-black);
--system-button-static-white-content-color-focus: var(--spectrum-black);
--system-button-static-white-secondary-background-color-default: var(
--spectrum-transparent-white-300
--spectrum-transparent-white-100
);
--system-button-static-white-secondary-background-color-hover: var(
--spectrum-transparent-white-400
--spectrum-transparent-white-200
);
--system-button-static-white-secondary-background-color-down: var(
--spectrum-transparent-white-500
--spectrum-transparent-white-200
);
--system-button-static-white-secondary-background-color-focus: var(
--spectrum-transparent-white-400
--spectrum-transparent-white-200
);
--system-button-static-white-secondary-content-color-default: var(
--spectrum-white
--spectrum-transparent-white-800
);
--system-button-static-white-secondary-content-color-hover: var(
--spectrum-white
--spectrum-transparent-white-900
);
--system-button-static-white-secondary-content-color-down: var(
--spectrum-white
--spectrum-transparent-white-900
);
--system-button-static-white-secondary-content-color-focus: var(
--spectrum-white
--spectrum-transparent-white-900
);
--system-button-static-white-secondary-outline-border-color-default: var(
--spectrum-transparent-white-400
--spectrum-transparent-white-300
);
--system-button-static-white-secondary-outline-border-color-hover: var(
--spectrum-transparent-white-500
--spectrum-transparent-white-400
);
--system-button-static-white-secondary-outline-border-color-down: var(
--spectrum-transparent-white-600
--spectrum-transparent-white-400
);
--system-button-static-white-secondary-outline-border-color-focus: var(
--spectrum-transparent-white-500
--spectrum-transparent-white-400
);
--system-button-static-white-outline-not-secondary-background-color-default: var(
--spectrum-transparent-white-25
);
--system-button-static-white-outline-not-secondary-background-color-hover: var(
--spectrum-transparent-white-400
--spectrum-transparent-white-100
);
--system-button-static-white-outline-not-secondary-background-color-down: var(
--spectrum-transparent-white-500
--spectrum-transparent-white-100
);
--system-button-static-white-outline-not-secondary-background-color-focus: var(
--spectrum-transparent-white-400
--spectrum-transparent-white-100
);
--system-button-static-white-outline-not-secondary-content-color-default: var(
--spectrum-white
--spectrum-transparent-white-800
);
--system-button-static-white-outline-not-secondary-content-color-hover: var(
--spectrum-white
--spectrum-transparent-white-900
);
--system-button-static-white-outline-not-secondary-content-color-down: var(
--spectrum-white
--spectrum-transparent-white-900
);
--system-button-static-white-outline-not-secondary-content-color-focus: var(
--spectrum-white
--spectrum-transparent-white-900
);
--system-button-static-white-outline-not-secondary-border-color-default: var(
--spectrum-transparent-white-900
--spectrum-transparent-white-800
);
--system-button-static-white-outline-not-secondary-border-color-hover: var(
--spectrum-transparent-white-1000
--spectrum-transparent-white-900
);
--system-button-static-white-outline-not-secondary-border-color-down: var(
--spectrum-transparent-white-1000
--spectrum-transparent-white-900
);
--system-button-static-white-outline-not-secondary-border-color-focus: var(
--spectrum-transparent-white-1000
--spectrum-transparent-white-900
);
--system-button-static-white-outline-secondary-background-color-hover: var(
--spectrum-transparent-white-400
--spectrum-transparent-white-100
);
--system-button-static-white-outline-secondary-background-color-down: var(
--spectrum-transparent-white-500
--spectrum-transparent-white-100
);
--system-button-static-white-outline-secondary-background-color-focus: var(
--spectrum-transparent-white-400
--spectrum-transparent-white-100
);
--system-button-static-black-background-color-default: var(
--spectrum-transparent-black-900
--spectrum-transparent-black-800
);
--system-button-static-black-background-color-hover: var(
--spectrum-transparent-black-1000
--spectrum-transparent-black-900
);
--system-button-static-black-background-color-down: var(
--spectrum-transparent-black-1000
--spectrum-transparent-black-900
);
--system-button-static-black-background-color-focus: var(
--spectrum-transparent-black-1000
--spectrum-transparent-black-900
);
--system-button-static-black-content-color-default: var(--spectrum-white);
--system-button-static-black-content-color-hover: var(--spectrum-white);
--system-button-static-black-content-color-down: var(--spectrum-white);
--system-button-static-black-content-color-focus: var(--spectrum-white);
--system-button-static-black-secondary-background-color-default: var(
--spectrum-transparent-black-300
--spectrum-transparent-black-100
);
--system-button-static-black-secondary-background-color-hover: var(
--spectrum-transparent-black-400
--spectrum-transparent-black-200
);
--system-button-static-black-secondary-background-color-down: var(
--spectrum-transparent-black-500
--spectrum-transparent-black-200
);
--system-button-static-black-secondary-background-color-focus: var(
--spectrum-transparent-black-400
--spectrum-transparent-black-200
);
--system-button-static-black-secondary-content-color-default: var(
--spectrum-black
--spectrum-transparent-black-800
);
--system-button-static-black-secondary-content-color-hover: var(
--spectrum-black
--spectrum-transparent-black-900
);
--system-button-static-black-secondary-content-color-down: var(
--spectrum-black
--spectrum-transparent-black-900
);
--system-button-static-black-secondary-content-color-focus: var(
--spectrum-black
);
--system-button-static-black-secondary-outline-background-color-hover: var(
--spectrum-transparent-black-400
);
--system-button-static-black-secondary-outline-background-color-down: var(
--spectrum-transparent-black-500
);
--system-button-static-black-secondary-outline-background-color-focus: var(
--spectrum-transparent-black-400
--spectrum-transparent-black-900
);
--system-button-static-black-secondary-outline-border-color-default: var(
--spectrum-transparent-black-400
--spectrum-transparent-black-300
);
--system-button-static-black-secondary-outline-border-color-hover: var(
--spectrum-transparent-black-500
--spectrum-transparent-black-400
);
--system-button-static-black-secondary-outline-border-color-down: var(
--spectrum-transparent-black-600
--spectrum-transparent-black-400
);
--system-button-static-black-secondary-outline-border-color-focus: var(
--spectrum-transparent-black-500
--spectrum-transparent-black-400
);
--system-button-static-black-outline-not-secondary-background-color-default: var(
--spectrum-transparent-black-25
);
--system-button-static-black-outline-not-secondary-background-color-hover: var(
--spectrum-transparent-black-400
--spectrum-transparent-black-100
);
--system-button-static-black-outline-not-secondary-background-color-down: var(
--spectrum-transparent-black-500
--spectrum-transparent-black-100
);
--system-button-static-black-outline-not-secondary-background-color-focus: var(
--spectrum-transparent-black-400
--spectrum-transparent-black-100
);
--system-button-static-black-outline-not-secondary-content-color-default: var(
--spectrum-black
--spectrum-transparent-black-800
);
--system-button-static-black-outline-not-secondary-content-color-hover: var(
--spectrum-black
--spectrum-transparent-black-900
);
--system-button-static-black-outline-not-secondary-content-color-down: var(
--spectrum-black
--spectrum-transparent-black-900
);
--system-button-static-black-outline-not-secondary-content-color-focus: var(
--spectrum-black
--spectrum-transparent-black-900
);
--system-button-static-black-outline-not-secondary-border-color-default: var(
--spectrum-transparent-black-500
--spectrum-transparent-black-800
);
--system-button-static-black-outline-not-secondary-border-color-hover: var(
--spectrum-transparent-black-600
--spectrum-transparent-black-900
);
--system-button-static-black-outline-not-secondary-border-color-down: var(
--spectrum-transparent-black-700
--spectrum-transparent-black-900
);
--system-button-static-black-outline-not-secondary-border-color-focus: var(
--spectrum-transparent-black-600
--spectrum-transparent-black-900
);
--system-button-static-black-outline-secondary-background-color-hover: var(
--spectrum-transparent-black-100
);
--system-button-static-black-outline-secondary-background-color-down: var(
--spectrum-transparent-black-100
);
--system-button-static-black-outline-secondary-background-color-focus: var(
--spectrum-transparent-black-100
);
--system-button-group-spacing-horizontal: var(--spectrum-spacing-300);
--system-button-group-spacing-vertical: var(--spectrum-spacing-300);
Expand Down
Loading
Loading