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

Fixed button and header colors

Browse Source
This commit is contained in:
Max Lynch
2013-09-10 11:06:06 -05:00
parent 8ba2411eb0
commit cbed88d5e7
3 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
scss/ionic/theme/_bar.scss
View File

@@ -30,51 +30,51 @@
&.bar-primary {
background-color: $bar-primary-bg;
border-color: $bar-primary-border-color;
color: $gray-light;
color: $white;
.tab-item a {
color: $gray-light;
color: $white;
}
}
&.bar-info {
background-color: $bar-info-bg;
border-color: $bar-info-border-color;
color: $gray-light;
color: $white;
.tab-item a {
color: $gray-light;
color: $white;
}
}
&.bar-success {
background-color: $bar-success-bg;
border-color: $bar-success-border-color;
color: $gray-light;
color: $white;
.tab-item a {
color: $gray-light;
color: $white;
}
}
&.bar-warning {
background-color: $bar-warning-bg;
border-color: $bar-warning-border-color;
color: $gray-light;
color: $white;
.tab-item a {
color: $gray-light;
color: $white;
}
}
&.bar-danger {
background-color: $bar-danger-bg;
border-color: $bar-danger-border-color;
color: $gray-light;
color: $white;
.tab-item a {
color: $gray-light;
color: $white;
}
}
&.bar-dark {
background-color: $bar-dark-bg;
border-color: $bar-dark-border-color;
color: $gray-light;
color: $white;
.tab-item a {
color: $gray-light;
color: $white;
}
}
@@ -101,33 +101,33 @@
.bar-primary {
.button {
@include button-style($button-primary-bg, $button-primary-border, $gray-light);
@include button-style($button-primary-bg, $button-primary-border, $white);
}
}
.bar-info {
.button {
@include button-style($button-info-bg, $button-info-border, $gray-light);
@include button-style($button-info-bg, $button-info-border, $white);
}
}
.bar-success {
.button {
@include button-style($button-success-bg, $button-success-border, $gray-light);
@include button-style($button-success-bg, $button-success-border, $white);
}
}
.bar-warning {
.button {
@include button-style($button-warning-bg, $button-warning-border, $gray-light);
@include button-style($button-warning-bg, $button-warning-border, $white);
}
}
.bar-danger {
.button {
@include button-style($button-danger-bg, $buttonDangerBorder, $gray-light);
@include button-style($button-danger-bg, $buttonDangerBorder, $white);
}
}
.bar-dark {
// A default style for buttons
.button {
@include button-style($button-dark-bg, $button-dark-border, $gray-light);
@include button-style($button-dark-bg, $button-dark-border, $white);
}
}

12
scss/ionic/theme/_button.scss
View File

@@ -13,22 +13,22 @@
@include button-style($button-secondary-bg, $button-secondary-border, $gray-dark);
}
&.button-primary {
@include button-style($button-primary-bg, $button-primary-border, $gray-light);
@include button-style($button-primary-bg, $button-primary-border, $white);
}
&.button-info {
@include button-style($button-info-bg, $button-info-border, $gray-light);
@include button-style($button-info-bg, $button-info-border, $white);
}
&.button-success {
@include button-style($button-success-bg, $button-success-border, $gray-light);
@include button-style($button-success-bg, $button-success-border, $white);
}
&.button-warning {
@include button-style($button-warning-bg, $button-warning-border, $gray-light);
@include button-style($button-warning-bg, $button-warning-border, $white);
}
&.button-danger {
@include button-style($button-danger-bg, $buttonDangerBorder, $gray-light);
@include button-style($button-danger-bg, $buttonDangerBorder, $white);
}
&.button-dark {
@include button-style($button-dark-bg, $button-dark-border, $gray-light);
@include button-style($button-dark-bg, $button-dark-border, $white);
}
&.button-clear {