diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css index 86aa6c0d4b..071411dc62 100644 --- a/dist/css/ionic-ios7.css +++ b/dist/css/ionic-ios7.css @@ -182,7 +182,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. @@ -558,7 +558,7 @@ a.subdued‎ { &.bar-footer { border-top-width: 1px; }*/ - box-shadow: inset 0 0 1px #999999; } + box-shadow: inset 0 0 1px #999; } .bar.bar-clear { border: none; background: none; @@ -1126,7 +1126,8 @@ a.item { .item-slider { padding: 0; } -.item-slider .item-content { +.item-slider .item-content, +.item-radio .item-content { /** * The content area of a complex list item. This area can * Slide left and right and be dragged to support different @@ -1433,6 +1434,7 @@ button.item-icon-right:after { .card .item, .card .item-divider, +.list-inset .item, .list-inset .item-divider, .padding > .list .item, .padding-horizontal > .list .item, @@ -1526,6 +1528,8 @@ textarea { -moz-flex: 0 0 24px; -ms-flex: 0 0 24px; flex: 0 0 24px; + position: static; + height: auto; display: inline-block; text-align: center; font-size: 16px; } @@ -1546,6 +1550,7 @@ textarea { -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; + display: block !important; overflow: hidden; padding: 4px 8px 3px; border: none; @@ -1621,7 +1626,7 @@ input[type="file"] { line-height: 34px; } select { - border: 1px solid #cccccc; + border: 1px solid #ccc; background-color: white; } select[multiple], @@ -1693,7 +1698,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" */ @@ -1708,7 +1713,12 @@ input[type="checkbox"][readonly] { right: 0; left: 20px; -webkit-transform: none; - transition-delay: 0.05s, 0s; } + transition-delay: .05s, 0s; } + +.item-radio { + padding: 0; } + .item-radio:hover { + cursor: pointer; } .item-radio .item-content { /* give some room to the right for the checkmark icon */ @@ -1978,7 +1988,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; } @@ -2317,9 +2327,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"; } @@ -2332,9 +2342,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 3003b79441..0efb7e229d 100644 --- a/dist/css/ionic-scoped.css +++ b/dist/css/ionic-scoped.css @@ -1027,7 +1027,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 */ @@ -1324,7 +1324,7 @@ &.bar-footer { border-top-width: 1px; }*/ - box-shadow: inset 0 0 1px #999999; } + box-shadow: inset 0 0 1px #999; } .ionic .bar.bar-clear { border: none; background: none; @@ -1849,7 +1849,8 @@ text-decoration: none; } .ionic .item-slider { padding: 0; } - .ionic .item-slider .item-content { + .ionic .item-slider .item-content, + .ionic .item-radio .item-content { /** * The content area of a complex list item. This area can * Slide left and right and be dragged to support different @@ -2107,6 +2108,7 @@ margin-bottom: -1px; } .ionic .card .item, .ionic .card .item-divider, + .ionic .list-inset .item, .ionic .list-inset .item-divider, .ionic .padding > .list .item, .ionic .padding-horizontal > .list .item, @@ -2193,6 +2195,8 @@ -moz-flex: 0 0 24px; -ms-flex: 0 0 24px; flex: 0 0 24px; + position: static; + height: auto; display: inline-block; text-align: center; font-size: 16px; } @@ -2211,6 +2215,7 @@ -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; + display: block !important; overflow: hidden; padding: 4px 8px 3px; border: none; @@ -2277,7 +2282,7 @@ .ionic input[type="file"] { line-height: 34px; } .ionic select { - border: 1px solid #cccccc; + border: 1px solid #ccc; background-color: white; } .ionic select[multiple], .ionic select[size] { @@ -2326,7 +2331,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%; @@ -2339,7 +2344,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 { @@ -2413,6 +2418,10 @@ top: 7.5px; right: 15px; z-index: 3; } + .ionic .item-radio { + padding: 0; } + .ionic .item-radio:hover { + cursor: pointer; } .ionic .item-radio .item-content { /* give some room to the right for the checkmark icon */ padding-right: 60px; } @@ -2677,7 +2686,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; } @@ -2926,9 +2935,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 { @@ -2940,9 +2949,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 89f9172e37..c349b53b5a 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -1261,7 +1261,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. @@ -1667,7 +1667,7 @@ a.subdued‎ { &.bar-footer { border-top-width: 1px; }*/ - box-shadow: inset 0 0 1px #999999; } + box-shadow: inset 0 0 1px #999; } .bar.bar-clear { border: none; background: none; @@ -2269,7 +2269,8 @@ a.item { .item-slider { padding: 0; } -.item-slider .item-content { +.item-slider .item-content, +.item-radio .item-content { /** * The content area of a complex list item. This area can * Slide left and right and be dragged to support different @@ -2576,6 +2577,7 @@ button.item-icon-right:after { .card .item, .card .item-divider, +.list-inset .item, .list-inset .item-divider, .padding > .list .item, .padding-horizontal > .list .item, @@ -2669,6 +2671,8 @@ textarea { -moz-flex: 0 0 24px; -ms-flex: 0 0 24px; flex: 0 0 24px; + position: static; + height: auto; display: inline-block; text-align: center; font-size: 16px; } @@ -2689,6 +2693,7 @@ textarea { -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; + display: block !important; overflow: hidden; padding: 4px 8px 3px; border: none; @@ -2764,7 +2769,7 @@ input[type="file"] { line-height: 34px; } select { - border: 1px solid #cccccc; + border: 1px solid #ccc; background-color: white; } select[multiple], @@ -2819,7 +2824,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 { @@ -2834,7 +2839,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); } @@ -2931,6 +2936,11 @@ input[type="checkbox"][readonly] { right: 15px; z-index: 3; } +.item-radio { + padding: 0; } + .item-radio:hover { + cursor: pointer; } + .item-radio .item-content { /* give some room to the right for the checkmark icon */ padding-right: 60px; } @@ -3199,7 +3209,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; } @@ -3606,9 +3616,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"; } @@ -3621,9 +3631,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/_form.scss b/scss/ionic/_form.scss index 2c12a5e8fb..7d8817f285 100644 --- a/scss/ionic/_form.scss +++ b/scss/ionic/_form.scss @@ -69,6 +69,8 @@ textarea { } [class^="icon-"], [class*=" icon-"] { @include flex(0, 0, 24px); + position: static; + height: auto; display: inline-block; text-align: center; font-size: 16px; @@ -94,6 +96,7 @@ textarea { .item-stacked-label textarea { @include border-radius(2px); + display: block !important; overflow: hidden; padding: 4px 8px 3px; border: none; diff --git a/scss/ionic/_items.scss b/scss/ionic/_items.scss index 95ad223937..8117ed79f1 100644 --- a/scss/ionic/_items.scss +++ b/scss/ionic/_items.scss @@ -106,7 +106,8 @@ a.item { .item-slider { padding: 0; } -.item-slider .item-content { +.item-slider .item-content, +.item-radio .item-content { /** * The content area of a complex list item. This area can * Slide left and right and be dragged to support different diff --git a/scss/ionic/_list.scss b/scss/ionic/_list.scss index 9aff44bdd1..04797db6cd 100644 --- a/scss/ionic/_list.scss +++ b/scss/ionic/_list.scss @@ -117,6 +117,7 @@ .card .item, .card .item-divider, +.list-inset .item, .list-inset .item-divider, .padding > .list .item, .padding-horizontal > .list .item, diff --git a/scss/ionic/_radio.scss b/scss/ionic/_radio.scss index 3d05161e45..f2c1717b55 100644 --- a/scss/ionic/_radio.scss +++ b/scss/ionic/_radio.scss @@ -2,6 +2,14 @@ // Radio Buttons // ------------------------------- +.item-radio { + padding: 0; + + &:hover { + cursor: pointer; + } +} + .item-radio .item-content { /* give some room to the right for the checkmark icon */ padding-right: $item-padding * 4;