Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
fix(card): Use on-surface color for action icons (#4519)
Browse files Browse the repository at this point in the history
  • Loading branch information
kfranqueiro authored Mar 25, 2019
1 parent a8a6660 commit 9f37016
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions packages/mdc-card/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@

.mdc-card__action-icons {
@include mdc-feature-targets($feat-color) {
@include mdc-theme-prop(color, text-icon-on-background);
@include mdc-theme-prop(color, $mdc-card-action-icon-color);
}

@include mdc-feature-targets($feat-structure) {
Expand Down Expand Up @@ -264,7 +264,7 @@

.mdc-card__action--icon:not(:disabled) {
@include mdc-feature-targets($feat-color) {
@include mdc-theme-prop(color, text-icon-on-background);
@include mdc-theme-prop(color, $mdc-card-action-icon-color);
}
}

Expand Down
2 changes: 2 additions & 0 deletions packages/mdc-card/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
//

@import "@material/theme/mixins";
@import "@material/theme/variables";

$mdc-card-action-icon-color: rgba(mdc-theme-prop-value(on-surface), mdc-theme-text-emphasis(medium)) !default;
$mdc-card-outline-color: mix(mdc-theme-prop-value(on-surface), mdc-theme-prop-value(surface), 12%) !default;
$mdc-card-outline-width: 1px !default;
8 changes: 4 additions & 4 deletions test/screenshot/golden.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,11 @@
}
},
"spec/mdc-card/classes/media.html": {
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/11/02/14_50_15_747/spec/mdc-card/classes/media.html?utm_source=golden_json",
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/kfranqueiro/2019/03/25/21_32_26_116/spec/mdc-card/classes/media.html?utm_source=golden_json",
"screenshots": {
"desktop_windows_chrome@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/11/02/14_50_15_747/spec/mdc-card/classes/media.html.windows_chrome_69.png",
"desktop_windows_firefox@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/11/02/14_50_15_747/spec/mdc-card/classes/media.html.windows_firefox_62.png",
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/11/02/14_50_15_747/spec/mdc-card/classes/media.html.windows_ie_11.png"
"desktop_windows_chrome@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/kfranqueiro/2019/03/25/21_32_26_116/spec/mdc-card/classes/media.html.windows_chrome_72.png",
"desktop_windows_firefox@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/kfranqueiro/2019/03/25/21_32_26_116/spec/mdc-card/classes/media.html.windows_firefox_65.png",
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/kfranqueiro/2019/03/25/21_32_26_116/spec/mdc-card/classes/media.html.windows_ie_11.png"
}
},
"spec/mdc-card/mixins/color-and-shape.html": {
Expand Down

0 comments on commit 9f37016

Please sign in to comment.