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

scss cleanup

Browse Source
This commit is contained in:
Adam Bradley
2013-11-26 23:57:48 -06:00
parent c38de498e9
commit 00f7362695
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dist/css/ionic.css vendored
View File

@@ -4550,6 +4550,9 @@ input[type="range"] {
* --------------------------------------------------
*/
.button {
color: #444444;
background-color: #f8f8f8;
border-color: #b2b2b2;
position: relative;
display: inline-block;
margin: 0;
@@ -4559,9 +4562,6 @@ input[type="range"] {
border-width: 1px;
border-style: solid;
border-radius: 2px;
color: #444444;
background-color: #f8f8f8;
border-color: #b2b2b2;
vertical-align: top;
text-align: center;
text-overflow: ellipsis;
@@ -4845,9 +4845,9 @@ input[type="range"] {
font-size: 18px;
line-height: 53px; }
.button-large .icon {
padding-bottom: 2px;
font-size: 32px;
line-height: 51px;
padding-bottom: 2px; }
line-height: 51px; }
.button-icon {
-webkit-transition: opacity 0.1s;
@@ -4855,14 +4855,14 @@ input[type="range"] {
transition: opacity 0.1s;
padding: 0 6px;
min-width: initial;
background: none;
border-color: transparent;
background: none;
background: none; }
.button-icon.button:active, .button-icon.button.active {
background: none;
border-color: transparent;
opacity: 0.3;
box-shadow: none; }
background: none;
box-shadow: none;
opacity: 0.3; }
.button-icon .icon {
font-size: 32px; }

18
scss/_button.scss
View File

@@ -5,11 +5,14 @@
*/
.button {
// set the color defaults
@include button-style($button-default-bg, $button-default-border, $button-default-active-bg, $button-default-active-border, $button-default-text);
position: relative;
display: inline-block;
margin: 0;
padding: 1px $button-padding 0 $button-padding;
min-width: ($button-padding * 3) + $button-font-size;
min-height: $button-height;
@@ -17,11 +20,7 @@
border-style: solid;
border-radius: $button-border-radius;
// set the color defaults
@include button-style($button-default-bg, $button-default-border, $button-default-active-bg, $button-default-active-border, $button-default-text);
vertical-align: top;
text-align: center;
text-overflow: ellipsis;
@@ -119,9 +118,9 @@
line-height: $button-large-height - $button-border-width;
.icon {
padding-bottom: ($button-border-width * 2);
font-size: $button-large-icon-size;
line-height: $button-large-height - ($button-border-width * 2) - 1;
padding-bottom: ($button-border-width * 2);
}
}
@@ -129,15 +128,15 @@
@include transition(opacity .1s);
padding: 0 6px;
min-width: initial;
background: none;
border-color: transparent;
background: none;
background: none;
&.button:active, &.button.active {
background: none;
border-color: transparent;
opacity: 0.3;
background: none;
box-shadow: none;
opacity: 0.3;
}
.icon {
@@ -173,6 +172,7 @@
.button-block {
display: block;
clear: both;
&:after {
display: block;
visibility: hidden;