javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 15:07:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

input now display:block

Browse Source
This commit is contained in:
Adam Bradley
2013-11-14 12:24:11 -06:00
parent 51215b5937
commit 3fb86299ba
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dist/css/ionic.css vendored
View File

@ -1,5 +1,5 @@
@charset "UTF-8"; @charset "UTF-8";
/* /*!
Ionicons, v1.3.4 Ionicons, v1.3.4
Created by Ben Sperry for the Ionic Framework, http://ionicons.com/ Created by Ben Sperry for the Ionic Framework, http://ionicons.com/
https://twitter.com/helloimben https://twitter.com/ionicframework https://twitter.com/helloimben https://twitter.com/ionicframework
@ -2045,7 +2045,7 @@ sub {
fieldset { fieldset {
margin: 0 2px; margin: 0 2px;
padding: 0.35em 0.625em 0.75em; 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. * 1. Correct `color` not being inherited in IE 8/9.
@ -3970,9 +3970,11 @@ textarea {
-moz-flex: 1 0 220px; -moz-flex: 1 0 220px;
-ms-flex: 1 0 220px; -ms-flex: 1 0 220px;
flex: 1 0 220px; flex: 1 0 220px;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
margin: 0; margin: 0;
background-color: transparent; background-color: transparent; }
-webkit-appearance: none; }
.item-input .icon { .item-input .icon {
-webkit-box-flex: 0; -webkit-box-flex: 0;
-webkit-flex: 0 0 24px; -webkit-flex: 0 0 24px;
@ -4041,7 +4043,7 @@ input[type="url"],
input[type="search"], input[type="search"],
input[type="tel"], input[type="tel"],
input[type="color"] { input[type="color"] {
display: inline-block; display: block;
height: 34px; height: 34px;
color: #111111; color: #111111;
vertical-align: middle; vertical-align: middle;
@ -4150,7 +4152,7 @@ input[type="checkbox"][readonly] {
border-radius: 50%; border-radius: 50%;
background: white; background: white;
content: ' '; content: ' ';
transition: background-color 0.1s ease-in-out; } transition: background-color .1s ease-in-out; }
/* the checkmark within the box */ /* the checkmark within the box */
.checkbox input:after { .checkbox input:after {
@ -4165,7 +4167,7 @@ input[type="checkbox"][readonly] {
border-right: 0; border-right: 0;
content: ' '; content: ' ';
opacity: 0; opacity: 0;
transition: opacity 0.05s ease-in-out; transition: opacity .05s ease-in-out;
-webkit-transform: rotate(-45deg); -webkit-transform: rotate(-45deg);
transform: rotate(-45deg); } transform: rotate(-45deg); }
@ -4650,7 +4652,7 @@ input[type="range"] {
.button-icon:active, .button-icon.active { .button-icon:active, .button-icon.active {
background: none; background: none;
box-shadow: none; box-shadow: none;
text-shadow: 0px 0px 10px white; } text-shadow: 0px 0px 10px #fff; }
.padding > .button.block:first-child { .padding > .button.block:first-child {
margin-top: 0; } margin-top: 0; }

5
dist/css/themes/ionic-ios7.css vendored
View File

@ -1,4 +1,3 @@
@charset "UTF-8";
/** /**
* Nav controllers and header bar animations * Nav controllers and header bar animations
*/ */
@ -119,7 +118,7 @@
right: 20px; right: 20px;
transition: 0.2s ease; transition: 0.2s ease;
transition-property: left, right; transition-property: left, right;
transition-delay: 0s, 0.05s; } transition-delay: 0s, .05s; }
.toggle :checked + .track { .toggle :checked + .track {
/* When the toggle is "on" */ /* When the toggle is "on" */
@ -134,4 +133,4 @@
right: 0; right: 0;
left: 20px; left: 20px;
-webkit-transform: none; -webkit-transform: none;
transition-delay: 0.05s, 0s; } transition-delay: .05s, 0s; }

4
scss/_form.scss
View File

@ -54,9 +54,9 @@ textarea {
input { input {
@include border-radius(0); @include border-radius(0);
@include flex(1, 0, 220px); @include flex(1, 0, 220px);
@include appearance(none);
margin: 0; margin: 0;
background-color: transparent; background-color: transparent;
-webkit-appearance: none;
} }
.icon { .icon {
@ -129,7 +129,7 @@ input[type="url"],
input[type="search"], input[type="search"],
input[type="tel"], input[type="tel"],
input[type="color"] { input[type="color"] {
display: inline-block; display: block;
height: $line-height-computed + $font-size-base; height: $line-height-computed + $font-size-base;
color: $input-color; color: $input-color;
vertical-align: middle; vertical-align: middle;