From 3fb86299ba42c6d018bfcd44a7f6517077f3764e Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Thu, 14 Nov 2013 12:24:11 -0600 Subject: [PATCH] input now display:block --- dist/css/ionic.css | 18 ++++++++++-------- dist/css/themes/ionic-ios7.css | 5 ++--- scss/_form.scss | 4 ++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dist/css/ionic.css b/dist/css/ionic.css index dc7f558dcb..9b960d1b81 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -1,5 +1,5 @@ @charset "UTF-8"; -/* +/*! Ionicons, v1.3.4 Created by Ben Sperry for the Ionic Framework, http://ionicons.com/ https://twitter.com/helloimben https://twitter.com/ionicframework @@ -2045,7 +2045,7 @@ sub { fieldset { margin: 0 2px; padding: 0.35em 0.625em 0.75em; - border: 1px solid silver; } + border: 1px solid #c0c0c0; } /** * 1. Correct `color` not being inherited in IE 8/9. @@ -3970,9 +3970,11 @@ textarea { -moz-flex: 1 0 220px; -ms-flex: 1 0 220px; flex: 1 0 220px; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; margin: 0; - background-color: transparent; - -webkit-appearance: none; } + background-color: transparent; } .item-input .icon { -webkit-box-flex: 0; -webkit-flex: 0 0 24px; @@ -4041,7 +4043,7 @@ input[type="url"], input[type="search"], input[type="tel"], input[type="color"] { - display: inline-block; + display: block; height: 34px; color: #111111; vertical-align: middle; @@ -4150,7 +4152,7 @@ input[type="checkbox"][readonly] { border-radius: 50%; background: white; content: ' '; - transition: background-color 0.1s ease-in-out; } + transition: background-color .1s ease-in-out; } /* the checkmark within the box */ .checkbox input:after { @@ -4165,7 +4167,7 @@ input[type="checkbox"][readonly] { border-right: 0; content: ' '; opacity: 0; - transition: opacity 0.05s ease-in-out; + transition: opacity .05s ease-in-out; -webkit-transform: rotate(-45deg); transform: rotate(-45deg); } @@ -4650,7 +4652,7 @@ input[type="range"] { .button-icon:active, .button-icon.active { background: none; box-shadow: none; - text-shadow: 0px 0px 10px white; } + text-shadow: 0px 0px 10px #fff; } .padding > .button.block:first-child { margin-top: 0; } diff --git a/dist/css/themes/ionic-ios7.css b/dist/css/themes/ionic-ios7.css index 53b57eba7c..680f21850c 100644 --- a/dist/css/themes/ionic-ios7.css +++ b/dist/css/themes/ionic-ios7.css @@ -1,4 +1,3 @@ -@charset "UTF-8"; /** * Nav controllers and header bar animations */ @@ -119,7 +118,7 @@ right: 20px; transition: 0.2s ease; transition-property: left, right; - transition-delay: 0s, 0.05s; } + transition-delay: 0s, .05s; } .toggle :checked + .track { /* When the toggle is "on" */ @@ -134,4 +133,4 @@ right: 0; left: 20px; -webkit-transform: none; - transition-delay: 0.05s, 0s; } + transition-delay: .05s, 0s; } diff --git a/scss/_form.scss b/scss/_form.scss index 51ba44a1ce..63ba942e91 100644 --- a/scss/_form.scss +++ b/scss/_form.scss @@ -54,9 +54,9 @@ textarea { input { @include border-radius(0); @include flex(1, 0, 220px); + @include appearance(none); margin: 0; background-color: transparent; - -webkit-appearance: none; } .icon { @@ -129,7 +129,7 @@ input[type="url"], input[type="search"], input[type="tel"], input[type="color"] { - display: inline-block; + display: block; height: $line-height-computed + $font-size-base; color: $input-color; vertical-align: middle;