diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css index 9eb08a3a01..b91aeef201 100644 --- a/dist/css/ionic-ios7.css +++ b/dist/css/ionic-ios7.css @@ -1460,6 +1460,11 @@ input[type="tel"], input[type="color"] { border: 0; } +input[type="radio"], +input[type="checkbox"] { + margin: 0; + line-height: normal; } + input[type="file"], input[type="image"], input[type="submit"], diff --git a/dist/css/ionic-scoped.css b/dist/css/ionic-scoped.css index 3c26c767ad..59ab16a896 100644 --- a/dist/css/ionic-scoped.css +++ b/dist/css/ionic-scoped.css @@ -2119,6 +2119,10 @@ .ionic input[type="tel"], .ionic input[type="color"] { border: 0; } + .ionic input[type="radio"], + .ionic input[type="checkbox"] { + margin: 0; + line-height: normal; } .ionic input[type="file"], .ionic input[type="image"], .ionic input[type="submit"], @@ -2177,7 +2181,7 @@ display: table; width: 100%; height: 100%; - border: 1px solid #5f85ef; + border: 1px solid #4a87ee; border-radius: 50%; background: white; content: ' '; @@ -2199,7 +2203,7 @@ transform: rotate(-45deg); } .ionic .checkbox input:checked:before { border: 0; - background: #5f85ef; } + background: #4a87ee; } .ionic .checkbox input:checked:after { opacity: 1; } .ionic .checkbox-item .list-item-content { @@ -2239,7 +2243,7 @@ transition-property: background-color, border; } .ionic .toggle .handle { position: absolute; - top: 6px; + top: 2px; left: 2px; display: block; width: 28px; @@ -2256,8 +2260,8 @@ padding: 17px 30px; content: " "; } .ionic .toggle input:checked:after { - border-color: #5f85ef; - background-color: #5f85ef; } + border-color: #4a87ee; + background-color: #4a87ee; } .ionic .toggle input:checked + .handle { background-color: white; -webkit-transform: translate3d(22px, 0, 0); } diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 3ac1cfbb3a..0d93d5e048 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -2603,6 +2603,11 @@ input[type="tel"], input[type="color"] { border: 0; } +input[type="radio"], +input[type="checkbox"] { + margin: 0; + line-height: normal; } + input[type="file"], input[type="image"], input[type="submit"], @@ -2669,7 +2674,7 @@ input[type="checkbox"][readonly] { display: table; width: 100%; height: 100%; - border: 1px solid #5f85ef; + border: 1px solid #4a87ee; border-radius: 50%; background: white; content: ' '; @@ -2695,7 +2700,7 @@ input[type="checkbox"][readonly] { /* what the background looks like when its checked */ .checkbox input:checked:before { border: 0; - background: #5f85ef; } + background: #4a87ee; } /* what the checkmark looks like when its checked */ .checkbox input:checked:after { @@ -2747,7 +2752,7 @@ input[type="checkbox"][readonly] { /* also the appearance when the handle is "off" */ .toggle .handle { position: absolute; - top: 6px; + top: 2px; left: 2px; display: block; width: 28px; @@ -2766,8 +2771,8 @@ input[type="checkbox"][readonly] { /* The track when the toggle is "on" */ .toggle input:checked:after { - border-color: #5f85ef; - background-color: #5f85ef; } + border-color: #4a87ee; + background-color: #4a87ee; } /* the handle when the toggle is "on" */ .toggle input:checked + .handle { diff --git a/scss/ionic/_form.scss b/scss/ionic/_form.scss index a2e81c3b20..74f3b6dad0 100644 --- a/scss/ionic/_form.scss +++ b/scss/ionic/_form.scss @@ -185,6 +185,13 @@ input[type="color"] { border: 0; } +// Position radios and checkboxes better +input[type="radio"], +input[type="checkbox"] { + margin: 0; + line-height: normal; +} + // Reset width of input images, buttons, radios, checkboxes input[type="file"], input[type="image"], diff --git a/scss/ionic/_toggle.scss b/scss/ionic/_toggle.scss index 287f440ecb..b6ee5d2f3a 100644 --- a/scss/ionic/_toggle.scss +++ b/scss/ionic/_toggle.scss @@ -39,7 +39,7 @@ /* also the appearance when the handle is "off" */ .toggle .handle { position: absolute; - top: ($toggle-height - $toggle-handle-height) + $toggle-border-width; + top: $toggle-border-width; left: $toggle-border-width; display: block; width: $toggle-handle-width; diff --git a/scss/ionic/_variables.scss b/scss/ionic/_variables.scss index 8e8cad9241..ef8523f961 100644 --- a/scss/ionic/_variables.scss +++ b/scss/ionic/_variables.scss @@ -153,7 +153,7 @@ $toggle-handle-radius: 50%; $toggle-off-bg-color: #E5E5E5; $toggle-off-border-color: #E5E5E5; -$toggle-on-bg-color: #5f85ef; +$toggle-on-bg-color: #4A87EE; $toggle-on-border-color: $toggle-on-bg-color; $toggle-handle-off-bg-color: $white; @@ -171,10 +171,10 @@ $checkbox-border-radius: 50%; $checkbox-border-width: 1px; $checkbox-off-bg-color: #fff; -$checkbox-off-border-color: #5f85ef; +$checkbox-off-border-color: #4A87EE; -$checkbox-on-bg-color: #5f85ef; -$checkbox-on-border-color: #5f85ef; +$checkbox-on-bg-color: #4A87EE; +$checkbox-on-border-color: #4A87EE; $checkbox-check-width: 3px; $checkbox-check-color: #fff;