diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css index 7e25431a26..46ef0bfec6 100644 --- a/dist/css/ionic-ios7.css +++ b/dist/css/ionic-ios7.css @@ -1,4 +1,3 @@ -@charset "UTF-8"; /** * Adapted from normalize.css and some reset.css. We don't care even one * bit about old IE, so we don't need any hacks for that in here. @@ -182,7 +181,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. @@ -1203,10 +1202,10 @@ a.list-icon-right .list-item-content:after, button.list-icon-right .list-item-content:after { display: none; } -.list-thumbnail .list-item-content { +.list-item-thumbnail .list-item-content { padding-left: 70px; min-height: 70px; } - .list-thumbnail .list-item-content img:first-child, .list-thumbnail .list-item-content .list-img { + .list-item-thumbnail .list-item-content img:first-child, .list-item-thumbnail .list-item-content .list-img { position: absolute; top: 15px; left: 15px; @@ -1215,10 +1214,10 @@ button.list-icon-right .list-item-content:after { width: 100%; border-radius: 4px; } -.list-thumbnail-lrg .list-item-content { +.list-item-thumbnail-lrg .list-item-content { padding-left: 95px; min-height: 80px; } - .list-thumbnail-lrg .list-item-content img:first-child, .list-thumbnail-lrg .list-item-content .list-img { + .list-item-thumbnail-lrg .list-item-content img:first-child, .list-item-thumbnail-lrg .list-item-content .list-img { position: absolute; top: 0; left: 0; @@ -1226,6 +1225,12 @@ button.list-icon-right .list-item-content:after { max-height: 80px; width: 100%; } +.list-item-image .list-item-content { + text-align: center; + padding: 0; } + .list-item-image .list-item-content img:first-child, .list-item-image .list-item-content .list-img { + width: 100%; } + .list-header { margin-top: 20px; padding: 5px 15px; @@ -1576,7 +1581,7 @@ input[type="checkbox"][readonly] { 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" */ @@ -1591,7 +1596,7 @@ input[type="checkbox"][readonly] { right: 0; left: 20px; -webkit-transform: none; - transition-delay: 0.05s, 0s; } + transition-delay: .05s, 0s; } .radio-buttton-list .list-item-content { /* give some room to the right for the checkmark icon */ @@ -1860,7 +1865,7 @@ input[type="range"] { .button.button-icon:active, .button.button-icon.active { background: none; box-shadow: none; - text-shadow: 0px 0px 10px white; } + text-shadow: 0px 0px 10px #fff; } .button.block, .button.button-full { margin-top: 10px; margin-bottom: 10px; } @@ -2236,9 +2241,9 @@ a.button { line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - -webkit-animation: spin 0.75s linear infinite; - -moz-animation: spin 0.75s linear infinite; - animation: spin 0.75s linear infinite; } + -webkit-animation: spin .75s linear infinite; + -moz-animation: spin .75s linear infinite; + animation: spin .75s linear infinite; } .icon-loading:before { content: "\e144"; } @@ -2251,9 +2256,9 @@ a.button { line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - -webkit-animation: spin 0.75s linear infinite; - -moz-animation: spin 0.75s linear infinite; - animation: spin 0.75s linear infinite; } + -webkit-animation: spin .75s linear infinite; + -moz-animation: spin .75s linear infinite; + animation: spin .75s linear infinite; } .icon-refreshing:before { content: "\e144"; } diff --git a/dist/css/ionic-scoped.css b/dist/css/ionic-scoped.css index 2b3e6afbf4..c0f24d4f46 100644 --- a/dist/css/ionic-scoped.css +++ b/dist/css/ionic-scoped.css @@ -1,4 +1,3 @@ -@charset "UTF-8"; .ionic { @font-face { font-family: 'ionicons'; @@ -1024,7 +1023,7 @@ .ionic fieldset { margin: 0 2px; padding: 0.35em 0.625em 0.75em; - border: 1px solid silver; } + border: 1px solid #c0c0c0; } .ionic legend { padding: 0; /* 2 */ @@ -1912,10 +1911,10 @@ .ionic a.list-icon-right .list-item-content:after, .ionic button.list-icon-right .list-item-content:after { display: none; } - .ionic .list-thumbnail .list-item-content { + .ionic .list-item-thumbnail .list-item-content { padding-left: 70px; min-height: 70px; } - .ionic .list-thumbnail .list-item-content img:first-child, .ionic .list-thumbnail .list-item-content .list-img { + .ionic .list-item-thumbnail .list-item-content img:first-child, .ionic .list-item-thumbnail .list-item-content .list-img { position: absolute; top: 15px; left: 15px; @@ -1923,16 +1922,21 @@ max-height: 40px; width: 100%; border-radius: 4px; } - .ionic .list-thumbnail-lrg .list-item-content { + .ionic .list-item-thumbnail-lrg .list-item-content { padding-left: 95px; min-height: 80px; } - .ionic .list-thumbnail-lrg .list-item-content img:first-child, .ionic .list-thumbnail-lrg .list-item-content .list-img { + .ionic .list-item-thumbnail-lrg .list-item-content img:first-child, .ionic .list-item-thumbnail-lrg .list-item-content .list-img { position: absolute; top: 0; left: 0; max-width: 80px; max-height: 80px; width: 100%; } + .ionic .list-item-image .list-item-content { + text-align: center; + padding: 0; } + .ionic .list-item-image .list-item-content img:first-child, .ionic .list-item-image .list-item-content .list-img { + width: 100%; } .ionic .list-header { margin-top: 20px; padding: 5px 15px; @@ -2221,7 +2225,7 @@ border-radius: 50%; background: white; content: ' '; - transition: background-color 0.1s ease-in-out; } + transition: background-color .1s ease-in-out; } .ionic .checkbox input:after { position: absolute; top: 34%; @@ -2234,7 +2238,7 @@ 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); } .ionic .checkbox input:checked:before { @@ -2571,7 +2575,7 @@ .ionic .button.button-icon:active, .ionic .button.button-icon.active { background: none; box-shadow: none; - text-shadow: 0px 0px 10px white; } + text-shadow: 0px 0px 10px #fff; } .ionic .button.block, .ionic .button.button-full { margin-top: 10px; margin-bottom: 10px; } @@ -2853,9 +2857,9 @@ line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - -webkit-animation: spin 0.75s linear infinite; - -moz-animation: spin 0.75s linear infinite; - animation: spin 0.75s linear infinite; } + -webkit-animation: spin .75s linear infinite; + -moz-animation: spin .75s linear infinite; + animation: spin .75s linear infinite; } .ionic .icon-loading:before { content: "\e144"; } .ionic .icon-refreshing { @@ -2867,9 +2871,9 @@ line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - -webkit-animation: spin 0.75s linear infinite; - -moz-animation: spin 0.75s linear infinite; - animation: spin 0.75s linear infinite; } + -webkit-animation: spin .75s linear infinite; + -moz-animation: spin .75s linear infinite; + animation: spin .75s linear infinite; } .ionic .icon-refreshing:before { content: "\e144"; } .ionic .hidden, diff --git a/dist/css/ionic.css b/dist/css/ionic.css index d1d6e57419..dc14ebc2ff 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -1,4 +1,3 @@ -@charset "UTF-8"; @font-face { font-family: 'ionicons'; src: url("fonts/ionicons.eot"); @@ -1261,7 +1260,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. @@ -2346,10 +2345,10 @@ a.list-icon-right .list-item-content:after, button.list-icon-right .list-item-content:after { display: none; } -.list-thumbnail .list-item-content { +.list-item-thumbnail .list-item-content { padding-left: 70px; min-height: 70px; } - .list-thumbnail .list-item-content img:first-child, .list-thumbnail .list-item-content .list-img { + .list-item-thumbnail .list-item-content img:first-child, .list-item-thumbnail .list-item-content .list-img { position: absolute; top: 15px; left: 15px; @@ -2358,10 +2357,10 @@ button.list-icon-right .list-item-content:after { width: 100%; border-radius: 4px; } -.list-thumbnail-lrg .list-item-content { +.list-item-thumbnail-lrg .list-item-content { padding-left: 95px; min-height: 80px; } - .list-thumbnail-lrg .list-item-content img:first-child, .list-thumbnail-lrg .list-item-content .list-img { + .list-item-thumbnail-lrg .list-item-content img:first-child, .list-item-thumbnail-lrg .list-item-content .list-img { position: absolute; top: 0; left: 0; @@ -2369,6 +2368,12 @@ button.list-icon-right .list-item-content:after { max-height: 80px; width: 100%; } +.list-item-image .list-item-content { + text-align: center; + padding: 0; } + .list-item-image .list-item-content img:first-child, .list-item-image .list-item-content .list-img { + width: 100%; } + .list-header { margin-top: 20px; padding: 5px 15px; @@ -2702,7 +2707,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 { @@ -2717,7 +2722,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); } @@ -3081,7 +3086,7 @@ input[type="range"] { .button.button-icon:active, .button.button-icon.active { background: none; box-shadow: none; - text-shadow: 0px 0px 10px white; } + text-shadow: 0px 0px 10px #fff; } .button.block, .button.button-full { margin-top: 10px; margin-bottom: 10px; } @@ -3508,9 +3513,9 @@ a.button { line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - -webkit-animation: spin 0.75s linear infinite; - -moz-animation: spin 0.75s linear infinite; - animation: spin 0.75s linear infinite; } + -webkit-animation: spin .75s linear infinite; + -moz-animation: spin .75s linear infinite; + animation: spin .75s linear infinite; } .icon-loading:before { content: "\e144"; } @@ -3523,9 +3528,9 @@ a.button { line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - -webkit-animation: spin 0.75s linear infinite; - -moz-animation: spin 0.75s linear infinite; - animation: spin 0.75s linear infinite; } + -webkit-animation: spin .75s linear infinite; + -moz-animation: spin .75s linear infinite; + animation: spin .75s linear infinite; } .icon-refreshing:before { content: "\e144"; } diff --git a/scss/ionic/_list.scss b/scss/ionic/_list.scss index 0fa33f2af0..ab7b036153 100644 --- a/scss/ionic/_list.scss +++ b/scss/ionic/_list.scss @@ -215,7 +215,7 @@ button.list-icon-right { // List Thumbnails // ------------------------------- -.list-thumbnail .list-item-content { +.list-item-thumbnail .list-item-content { padding-left: $list-thumbnail-width + ($list-item-padding * 2); min-height: $list-thumbnail-width + ($list-item-padding * 2); @@ -230,7 +230,7 @@ button.list-icon-right { } } -.list-thumbnail-lrg .list-item-content { +.list-item-thumbnail-lrg .list-item-content { padding-left: $list-thumbnail-lrg-width + $list-item-padding; min-height: $list-thumbnail-lrg-height; @@ -245,6 +245,19 @@ button.list-icon-right { } +// List Image +// ------------------------------- + +.list-item-image .list-item-content { + text-align: center; + padding: 0; + + img:first-child, .list-img { + width: 100%; + } +} + + // List Header // ------------------------------- diff --git a/test/cards.html b/test/cards.html index 3cdd5f9923..475866015c 100644 --- a/test/cards.html +++ b/test/cards.html @@ -90,21 +90,19 @@