From 00f7362695057f7fb3efd1181be19b1d02200f15 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 26 Nov 2013 23:57:48 -0600 Subject: [PATCH] scss cleanup --- dist/css/ionic.css | 18 +++++++++--------- scss/_button.scss | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 3360098fbb..4a5e162ecd 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -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; } diff --git a/scss/_button.scss b/scss/_button.scss index ae7b415daa..1ac2149dfa 100644 --- a/scss/_button.scss +++ b/scss/_button.scss @@ -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;