javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(button): remove color shade from clear buttons

Browse Source
This commit is contained in:
Brandy Carney
2016-01-22 14:12:31 -05:00
parent a4137d2bdc
commit a8e7941a27
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ionic/components/button/button.ios.scss
View File

@ -157,7 +157,7 @@ $button-ios-small-icon-font-size: 1.3em !default;
.button-clear { .button-clear {
border-color: transparent; border-color: transparent;
color: color-shade($button-ios-color); color: $button-ios-color;
background-color: transparent; background-color: transparent;
&.activated { &.activated {
@ -167,7 +167,7 @@ $button-ios-small-icon-font-size: 1.3em !default;
&:hover:not(.disable-hover) { &:hover:not(.disable-hover) {
opacity: 0.6; opacity: 0.6;
color: color-shade($button-ios-color); color: $button-ios-color;
} }
} }
@ -178,7 +178,7 @@ $button-ios-small-icon-font-size: 1.3em !default;
@mixin ios-button-clear($color-name, $color-value) { @mixin ios-button-clear($color-name, $color-value) {
.button-clear-#{$color-name} { .button-clear-#{$color-name} {
$fg-color: color-shade($color-value); $fg-color: $color-value;
border-color: transparent; border-color: transparent;
background-color: transparent; background-color: transparent;
color: $fg-color; color: $fg-color;
@ -188,7 +188,7 @@ $button-ios-small-icon-font-size: 1.3em !default;
} }
&:hover:not(.disable-hover) { &:hover:not(.disable-hover) {
color: color-shade($fg-color); color: $fg-color;
} }
} }

9
ionic/components/button/button.md.scss
View File

@ -186,7 +186,7 @@ $button-md-small-icon-font-size: 1.4em !default;
opacity: 1; opacity: 1;
box-shadow: none; box-shadow: none;
background-color: transparent; background-color: transparent;
color: color-shade($button-md-color); color: $button-md-color;
&.activated { &.activated {
background-color: $button-md-clear-active-background-color; background-color: $button-md-clear-active-background-color;
@ -194,7 +194,8 @@ $button-md-small-icon-font-size: 1.4em !default;
} }
&:hover:not(.disable-hover) { &:hover:not(.disable-hover) {
color: color-shade($button-md-color);
color: $button-md-color;
} }
} }
@ -205,7 +206,7 @@ $button-md-small-icon-font-size: 1.4em !default;
@mixin md-button-clear($color-name, $color-value) { @mixin md-button-clear($color-name, $color-value) {
.button-clear-#{$color-name} { .button-clear-#{$color-name} {
$fg-color: color-shade($color-value); $fg-color: $color-value;
border-color: transparent; border-color: transparent;
background-color: transparent; background-color: transparent;
color: $fg-color; color: $fg-color;
@ -217,7 +218,7 @@ $button-md-small-icon-font-size: 1.4em !default;
} }
&:hover:not(.disable-hover) { &:hover:not(.disable-hover) {
color: color-shade($fg-color); color: $fg-color;
} }
} }
} }