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

Updated button styles to Ben's taste

Browse Source
This commit is contained in:
Max Lynch
2013-09-25 11:33:29 -05:00
parent a8a2217182
commit 02db453c70
6 changed files with 147 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scss/ionic/_bar.scss
View File

@ -118,45 +118,45 @@
.bar-default {
.button {
@include button-style($button-default-bg, $buttonDefaultBorder, $gray-dark);
@include button-style($button-default-bg, $button-default-border, $button-default-active-bg, $button-default-active-border, $gray-dark);
}
}
.bar-secondary {
.button {
@include button-style($button-secondary-bg, $button-secondary-border, $gray-dark);
@include button-style($button-secondary-bg, $button-secondary-border, $button-secondary-active-bg, $button-secondary-active-border, $gray-dark);
}
}
.bar-primary {
.button {
@include button-style($button-primary-bg, $button-primary-border, $white);
@include button-style($button-primary-bg, $button-primary-border, $button-primary-active-bg, $button-primary-active-border, $white);
}
}
.bar-info {
.button {
@include button-style($button-info-bg, $button-info-border, $white);
@include button-style($button-info-bg, $button-info-border, $button-info-active-bg, $button-info-active-border, $white);
}
}
.bar-success {
.button {
@include button-style($button-success-bg, $button-success-border, $white);
@include button-style($button-success-bg, $button-success-border, $button-success-active-bg, $button-success-active-border, $white);
}
}
.bar-warning {
.button {
@include button-style($button-warning-bg, $button-warning-border, $white);
@include button-style($button-warning-bg, $button-warning-border, $button-warning-active-bg, $button-warning-active-border, $white);
}
}
.bar-danger {
.button {
@include button-style($button-danger-bg, $buttonDangerBorder, $white);
@include button-style($button-danger-bg, $button-danger-border, $button-danger-active-bg, $button-danger-active-border, $white);
}
}
.bar-dark {
// A default style for buttons
.button {
@include button-style($button-dark-bg, $button-dark-border, $white);
@include button-style($button-dark-bg, $button-dark-border, $button-dark-active-bg, $button-dark-active-border, $white);
}
}

18
scss/ionic/_button.scss
View File

@ -29,28 +29,28 @@
}
&.button-default {
@include button-style($button-default-bg, $buttonDefaultBorder, $gray-dark);
@include button-style($button-default-bg, $button-default-border, $button-default-active-bg, $button-default-active-border, $gray-dark);
}
&.button-secondary {
@include button-style($button-secondary-bg, $button-secondary-border, $gray-dark);
@include button-style($button-secondary-bg, $button-secondary-border, $button-secondary-active-bg, $button-secondary-active-border, $gray-dark);
}
&.button-primary {
@include button-style($button-primary-bg, $button-primary-border, $white);
@include button-style($button-primary-bg, $button-primary-border, $button-primary-active-bg, $button-primary-active-border, $white);
}
&.button-info {
@include button-style($button-info-bg, $button-info-border, $white);
@include button-style($button-info-bg, $button-info-border, $button-info-active-bg, $button-info-active-border, $white);
}
&.button-success {
@include button-style($button-success-bg, $button-success-border, $white);
@include button-style($button-success-bg, $button-success-border, $button-success-active-bg, $button-success-active-border, $white);
}
&.button-warning {
@include button-style($button-warning-bg, $button-warning-border, $white);
@include button-style($button-warning-bg, $button-warning-border, $button-warning-active-bg, $button-warning-active-border, $white);
}
&.button-danger {
@include button-style($button-danger-bg, $buttonDangerBorder, $white);
@include button-style($button-danger-bg, $button-danger-border, $button-danger-active-bg, $button-danger-active-border, $white);
}
&.button-dark {
@include button-style($button-dark-bg, $button-dark-border, $white);
@include button-style($button-dark-bg, $button-dark-border, $button-dark-active-bg, $button-dark-active-border, $white);
}
&.button-icon {
@ -72,6 +72,6 @@ a.button {
background: transparent;
}
.button-borderless [class^="icon-"] {
.button-clear [class^="icon-"] {
font-size: 24px;
}