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 branch 'master' of https://github.com/driftyco/framework-prototypes

Browse Source 
Conflicts:
	dist/ionic.css
	scss/ionic/structure/_bar.scss
This commit is contained in:
Adam Bradley
2013-09-10 13:54:30 -05:00
parent 292ff90193 d2b0f7f12a
commit 41ee7fbd64
4 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scss/ionic/_button.scss
View File

@@ -31,22 +31,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 {
@@ -54,6 +54,16 @@
border: none;
padding: $button-clear-padding;
}
&.button-icon {
background: none;
border: none;
&:active, &.active {
text-shadow: 0px 0px 10px #fff;
box-shadow: none;
background: none;
}
}
}
a.button {