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.

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

fix(button): fix custom hover color style on outline/ghost buttons #557

Merged
merged 1 commit into from
Jul 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/Button/src/Button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function setColorVariables(tokens, variant) {
const hoverStateAdjust = 0.08;
const activeStateAdjust = 0.16;
const focusAlphaAdjust = 0.3;
const colorHover = tokens.colorHover
const colorHover = tokens.colorHover && variant === 'fill'
? tokens.colorHover : colorMainHover[stateAdjustment](hoverStateAdjust).toHex();
const colorActive = colorMainHover[stateAdjustment](activeStateAdjust).toHex();
const colorFocus = colorMainHover.alpha(focusAlphaAdjust).toHex();
Expand Down
2 changes: 1 addition & 1 deletion src/components/Icon/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Themable props* can be configured via the [Theme](#/Theme) component using the k
| pattern* | `string` | — | `'info'`, `'warning'`, `'error'`, `'success'`, `'primary'`, any custom pattern defined within the theme | pattern defined in theme |
| name* | `string` | `'info'` | - | name of icon, defined in theme |
| size | `string` | `'small'` | `'small'`, `'medium'`, `'large'`, `'xlarge'`, `'xxlarge'` | size of icon, can be named value or any valid CSS width/height |
| color* | `string` | `'inherit'` | - | color of icon |
| color* | `string` | `'currentColor'` | - | color of icon |
| fill* | `string` | `'currentColor'` | - | fill of icon |


Expand Down
Loading