javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 23:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(button) use currentColor fill for icons

Browse Source
This commit is contained in:
Cam Wiegert
2017-11-28 14:34:19 -06:00
parent a9793e31ce
commit 78dbbc790b
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/src/components/button/button.ios.scss
View File

@ -39,6 +39,9 @@ $button-ios-border-radius: 4px !default;
/// @prop - Font size of the button text /// @prop - Font size of the button text
$button-ios-font-size: 1.6rem !default; $button-ios-font-size: 1.6rem !default;
/// @prop - Color of the button icon
$button-ios-icon-fill-color: currentColor !default;
/// @prop - Background color of the button /// @prop - Background color of the button
$button-ios-background-color: color($colors-ios, primary) !default; $button-ios-background-color: color($colors-ios, primary) !default;
@ -208,6 +211,10 @@ $button-ios-strong-font-weight: 600 !default;
opacity: $button-ios-opacity-hover; opacity: $button-ios-opacity-hover;
} }
.button-ios .icon {
fill: $button-ios-icon-fill-color;
}
// iOS Default Button Color Mixin // iOS Default Button Color Mixin
// -------------------------------------------------- // --------------------------------------------------

7
packages/core/src/components/button/button.md.scss
View File

@ -46,6 +46,9 @@ $button-md-font-weight: 500 !default;
/// @prop - Capitalization of the button text /// @prop - Capitalization of the button text
$button-md-text-transform: uppercase !default; $button-md-text-transform: uppercase !default;
/// @prop - Color of the button icon
$button-md-icon-fill-color: currentColor !default;
/// @prop - Background color of the button /// @prop - Background color of the button
$button-md-background-color: color($colors-md, primary) !default; $button-md-background-color: color($colors-md, primary) !default;
@ -258,6 +261,10 @@ $button-md-strong-font-weight: bold !default;
background-color: $button-md-text-color; background-color: $button-md-text-color;
} }
.button-md .icon {
fill: $button-md-icon-fill-color;
}
// Material Design Default Button Color Mixin // Material Design Default Button Color Mixin
// -------------------------------------------------- // --------------------------------------------------