javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

color updates

Browse Source
This commit is contained in:
Adam Bradley
2015-08-11 22:10:25 -05:00
parent f70aff1895
commit 147a7e68ff
23 changed files with 265 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ionic/components/button/button.scss
View File

@@ -14,7 +14,7 @@ $button-round-padding: 0 2.6rem !default;
$button-color: color(primary) !default;
$button-color-activated: darken-or-lighten($button-color) !default;
$button-text-color: inverse(primary) !default;
$button-text-color: inverse($button-color) !default;
$button-hover-opacity: 0.88 !default;
@@ -112,7 +112,6 @@ button,
padding: $button-round-padding;
}
&.disabled,
&[disabled] {
opacity: 0.4;
cursor: default !important;
@@ -121,17 +120,15 @@ button,
}
a[button] {
text-decoration: none;
}
.padding > button[block]:first-child,
.padding > [button][block]:first-child {
margin-top: 0;
}
a[button] {
color: inherit;
text-decoration: none;
}
// Default Button Color Mixin
// --------------------------------------------------
@@ -156,7 +153,7 @@ a[button] {
$bg-color: $value;
$bg-color-activated: darken-or-lighten($bg-color);
$text-color: inverse($color);
$text-color: inverse($bg-color);
@include button-default($bg-color, $bg-color-activated, $text-color);
}