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

fix(button): avoid overriding styles on SVGS with paths #7632

Merged
merged 3 commits into from
Jan 25, 2021
Merged

fix(button): avoid overriding styles on SVGS with paths #7632

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee282b7
fix(button): avoid overriding styles on SVGS with paths
emyarod Jan 22, 2021
aeff651
Merge branch 'master' into 7631-ghost-danger-icon-button-svgs
kodiakhq[bot] Jan 25, 2021
b0a8bf9
Merge branch 'master' into 7631-ghost-danger-icon-button-svgs
kodiakhq[bot] Jan 25, 2021
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
9 changes: 1 addition & 8 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 @@ -162,11 +162,6 @@
}
}

.#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--btn--ghost:focus svg,
.#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--btn--ghost:hover svg {
fill: $icon-01;
}

.#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--tooltip__trigger:focus {
border-color: $focus;

Expand Down Expand Up @@ -224,8 +219,6 @@
.#{$prefix}--btn__icon,
.#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--btn--ghost:hover
.#{$prefix}--btn__icon {
fill: $icon-01;

// Windows, Firefox HCM Fix
@media screen and (-ms-high-contrast: active),
screen and (prefers-contrast) {
Expand All @@ -238,7 +231,7 @@

.#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only
.#{$prefix}--btn__icon
path,
path:not([data-icon-path]),
.#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only .#{$prefix}--btn__icon {
fill: $icon-01;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/components/button/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
}

.#{$prefix}--btn__icon,
.#{$prefix}--btn__icon path {
.#{$prefix}--btn__icon path:not([data-icon-path]) {
fill: $icon-color;
}
}
Expand Down