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

Jump to bottom

fix(button): use currentColor as icon fill for all states #5270

Merged
merged 4 commits into from
Feb 6, 2020
Merged

fix(button): use currentColor as icon fill for all states #5270

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42a1d93
fix(button): use currentColor as icon fill for all states
janhassel Feb 4, 2020
d1618f2
Merge branch 'master' into button-icon-color
janhassel Feb 5, 2020
c879413
Merge branch 'master' into button-icon-color
tw15egan Feb 6, 2020
96beda4
Merge branch 'master' into button-icon-color
asudoh Feb 6, 2020
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
23 changes: 1 addition & 22 deletions packages/components/src/components/button/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@

.#{$prefix}--btn {
@include button-base;

&.#{$prefix}--btn--disabled > svg.#{$prefix}--btn__icon,
&:disabled > svg.#{$prefix}--btn__icon {
fill: $disabled-03;
}
}

// Reset intrisic padding in Firefox (see #731)
Expand Down Expand Up @@ -113,14 +108,6 @@
background: transparent;
color: $disabled;
outline: none;

> .#{$prefix}--btn__icon path {
fill: $disabled;
}
}

&:hover > .#{$prefix}--btn__icon path {
fill: $inverse-01;
}
}

Expand Down Expand Up @@ -156,10 +143,6 @@
&:hover,
&:active {
color: $hover-primary-text;

.#{$prefix}--btn__icon path {
fill: $hover-primary-text;
}
}

&:active {
Expand All @@ -176,10 +159,6 @@
background: transparent;
border-color: transparent;
outline: none;

.#{$prefix}--btn__icon path {
fill: $disabled;
}
}

&.#{$prefix}--btn--sm {
Expand Down Expand Up @@ -273,7 +252,7 @@
$danger,
$text-04,
$hover-danger,
$icon-03,
currentColor,
$active-danger
);

Expand Down