From 21b71b763baf1b6ba7c982e4a5496aaac3733664 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Wed, 27 Nov 2013 00:06:27 -0600 Subject: [PATCH] forms scss cleanup --- dist/css/ionic.css | 14 +++++++------- scss/_form.scss | 17 +++++++++-------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 3eb761bb2f..287a9587fe 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -4110,13 +4110,13 @@ textarea { -ms-flex: 0 0 24px; flex: 0 0 24px; position: static; - height: auto; display: inline-block; + height: auto; text-align: center; font-size: 16px; } .item-input.item.active, .ionic-pseudo .item-input.item:active { - background-color: transparent; - border-color: #dddddd; } + border-color: #dddddd; + background-color: transparent; } .input-label { -webkit-box-flex: 1; @@ -4216,6 +4216,10 @@ input[type="radio"], input[type="checkbox"] { width: auto; } +select[multiple], +select[size] { + height: auto; } + select, input[type="file"] { line-height: 34px; } @@ -4224,10 +4228,6 @@ select { border: 1px solid #dddddd; background-color: white; } -select[multiple], -select[size] { - height: auto; } - input:-moz-placeholder, textarea:-moz-placeholder { color: #aaaaaa; } diff --git a/scss/_form.scss b/scss/_form.scss index 6e6a28ab07..4f1fd85e6c 100644 --- a/scss/_form.scss +++ b/scss/_form.scss @@ -1,3 +1,4 @@ + /** * Forms * -------------------------------------------------- @@ -62,16 +63,16 @@ textarea { .icon { @include flex(0, 0, 24px); position: static; - height: auto; display: inline-block; + height: auto; text-align: center; font-size: 16px; } &.item.active, .ionic-pseudo &.item:active { - background-color: transparent; border-color: $item-default-border; + background-color: transparent; } } @@ -188,6 +189,12 @@ input[type="checkbox"] { width: auto; // Override of generic input selector } +// Make multiple select elements height not fixed +select[multiple], +select[size] { + height: auto; +} + // Set the height of select and file controls to match text inputs select, input[type="file"] { @@ -200,12 +207,6 @@ select { background-color: $input-bg; // Chrome on Linux and Mobile Safari need background-color } -// Make multiple select elements height not fixed -select[multiple], -select[size] { - height: auto; -} - // Placeholder // -------------------------------