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

merge

Browse Source
This commit is contained in:
Adam Bradley
2013-11-05 20:39:56 -06:00
parent 7955c49ccf 7b9698e8b7
commit 954eb3e416
18 changed files with 257 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dist/css/ionic.css vendored
View File

@@ -2013,7 +2013,7 @@ sub {
fieldset {
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
border: 1px solid #c0c0c0; }
border: 1px solid silver; }
/**
* 1. Correct `color` not being inherited in IE 8/9.
@@ -3360,11 +3360,13 @@ button.item-button-right:after {
* "edit mode"
*/
.list-editing .item-content {
margin-right: 30px;
margin-left: 30px; }
margin-right: 50px;
margin-left: 50px; }
.list-editing .item-edit {
left: 0px;
opacity: 1; }
.list-editing .item-edit i {
left: 5px; }
.list-header {
margin-top: 20px;
@@ -3618,7 +3620,7 @@ input[type="file"] {
line-height: 34px; }
select {
border: 1px solid #ccc;
border: 1px solid #cccccc;
background-color: white; }
select[multiple],
@@ -3673,7 +3675,7 @@ input[type="checkbox"][readonly] {
border-radius: 50%;
background: white;
content: ' ';
transition: background-color .1s ease-in-out; }
transition: background-color 0.1s ease-in-out; }
/* the checkmark within the box */
.checkbox input:after {
@@ -3688,7 +3690,7 @@ input[type="checkbox"][readonly] {
border-right: 0;
content: ' ';
opacity: 0;
transition: opacity .05s ease-in-out;
transition: opacity 0.05s ease-in-out;
-webkit-transform: rotate(-45deg);
transform: rotate(-45deg); }
@@ -4602,9 +4604,9 @@ a.button {
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-animation: spin .75s linear infinite;
-moz-animation: spin .75s linear infinite;
animation: spin .75s linear infinite; }
-webkit-animation: spin 0.75s linear infinite;
-moz-animation: spin 0.75s linear infinite;
animation: spin 0.75s linear infinite; }
.ion-loading:before {
content: "\e144"; }
@@ -4617,9 +4619,9 @@ a.button {
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-animation: spin .75s linear infinite;
-moz-animation: spin .75s linear infinite;
animation: spin .75s linear infinite; }
-webkit-animation: spin 0.75s linear infinite;
-moz-animation: spin 0.75s linear infinite;
animation: spin 0.75s linear infinite; }
.ion-refreshing:before {
content: "\e144"; }