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

Button: Add hover style to secondary variant #67325

Merged
merged 16 commits into from
Dec 11, 2024
+10 −10
Merged

Button: Add hover style to secondary variant #67325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
df59ee7
Update secondary button appearance
jameskoster Nov 26, 2024
350c5ea
Apply increased font weight to primary and tertiary button variants
jameskoster Nov 28, 2024
3e3ec90
Merge branch 'trunk' into update/secondary-button-styles
jameskoster Nov 28, 2024
8d5e186
Changelog
jameskoster Nov 28, 2024
a7e9025
Remove antialiasing
jameskoster Nov 29, 2024
64a84d0
Merge branch 'trunk' into update/secondary-button-styles
jameskoster Nov 29, 2024
a25081c
Update packages/components/src/button/style.scss
jameskoster Dec 4, 2024
d68ec6a
Consistent hover color, increase weight of default variant
jameskoster Dec 4, 2024
b44c8ef
Fix secondary hover + is-pressed color
jameskoster Dec 4, 2024
e4d6b9c
Remove weight changes
jameskoster Dec 9, 2024
a6e436b
Merge branch 'trunk' into update/secondary-button-styles
jameskoster Dec 9, 2024
d527bd2
Update changelog
jameskoster Dec 9, 2024
8980b03
Update packages/components/src/button/style.scss
jameskoster Dec 10, 2024
6b33151
Update packages/components/src/button/style.scss
jameskoster Dec 10, 2024
bcc9793
Rebase
jameskoster Dec 10, 2024
02c2084
changelog
jameskoster Dec 10, 2024
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
1 change: 1 addition & 0 deletions packages/components/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
- `MenuItem`: Increase height to 40px ([#67435](https://github.com/WordPress/gutenberg/pull/67435)).
- `MenuItemsChoice`: Increase option height to 40px ([#67435](https://github.com/WordPress/gutenberg/pull/67435)).
- `Navigation`: Fix active item hover color ([#67732](https://github.com/WordPress/gutenberg/pull/67732)).
- `Button`: Adjust `secondary` variant hover style. ([#67325](https://github.com/WordPress/gutenberg/pull/67325)).

### Deprecations

Expand Down
19 changes: 9 additions & 10 deletions packages/components/src/button/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
display: inline-flex;
text-decoration: none;
font-family: inherit;
font-weight: normal;
font-size: $default-font-size;
margin: 0;
border: 0;
Expand Down Expand Up @@ -139,8 +138,10 @@
color: $components-color-accent;
background: transparent;

&:hover:not(:disabled, [aria-disabled="true"]) {
box-shadow: inset 0 0 0 $border-width $components-color-accent-darker-10;
&:hover:not(:disabled, [aria-disabled="true"], .is-pressed) {
box-shadow: inset 0 0 0 $border-width $components-color-accent-darker-20;
color: $components-color-accent-darker-20;
background: color-mix(in srgb, $components-color-accent 4%, transparent);
}

&:disabled:not(:focus),
Expand All @@ -164,15 +165,12 @@
background: transparent;

&:hover:not(:disabled, [aria-disabled="true"]) {
// TODO: Prepare for theming (https://github.com/WordPress/gutenberg/pull/45466/files#r1030872724)
/* stylelint-disable-next-line declaration-property-value-disallowed-list -- Allow tertiary buttons to use colors from the user admin color scheme. */
background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
background: color-mix(in srgb, $components-color-accent 4%, transparent);
color: $components-color-accent-darker-20;
}

&:active:not(:disabled, [aria-disabled="true"]) {
// TODO: Prepare for theming (https://github.com/WordPress/gutenberg/pull/45466/files#r1030872724)
/* stylelint-disable-next-line declaration-property-value-disallowed-list -- Allow tertiary buttons to use colors from the user admin color scheme. */
background: rgba(var(--wp-admin-theme-color--rgb), 0.08);
background: color-mix(in srgb, $components-color-accent 8%, transparent);
}

// Pull left if the tertiary button stands alone after a description, so as to vertically align with items above.
Expand Down Expand Up @@ -220,7 +218,8 @@
}
}

&.is-tertiary {
&.is-tertiary,
&.is-secondary {
&:hover:not(:disabled, [aria-disabled="true"]) {
background: rgba($alert-red, 0.04);
}
Expand Down
Loading