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

Merge pull request #212 from lwu/master

Browse Source 
Avoid white as button-clear text color for .bar-light and .bar-stable
This commit is contained in:
Adam Bradley
2013-11-25 08:42:34 -08:00
parent fe61ef0e49 1ab42a5dd9
commit dfe1e311f5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/css/ionic.css vendored
View File

@@ -2798,7 +2798,7 @@ a.subdued {
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
border-color: #cccccc; }
.bar-light .button.button-clear {
color: white;
color: #444444;
background: none;
border-color: transparent;
box-shadow: none;
@@ -2819,7 +2819,7 @@ a.subdued {
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
border-color: #a2a2a2; }
.bar-stable .button.button-clear {
color: white;
color: #444444;
background: none;
border-color: transparent;
box-shadow: none;

4
scss/_bar.scss
View File

@@ -155,13 +155,13 @@
.bar-light {
.button {
@include button-style($bar-light-bg, $bar-light-border, $bar-light-active-bg, $bar-light-active-border, $bar-light-text);
@include button-clear(#fff, $bar-title-font-size);
@include button-clear($bar-light-text, $bar-title-font-size);
}
}
.bar-stable {
.button {
@include button-style($bar-stable-bg, $bar-stable-border, $bar-stable-active-bg, $bar-stable-active-border, $bar-stable-text);
@include button-clear(#fff, $bar-title-font-size);
@include button-clear($bar-stable-text, $bar-title-font-size);
}
}
.bar-positive {