diff --git a/ionic/components/action-sheet/action-sheet.ts b/ionic/components/action-sheet/action-sheet.ts index 030a581beb..61cf193fc8 100644 --- a/ionic/components/action-sheet/action-sheet.ts +++ b/ionic/components/action-sheet/action-sheet.ts @@ -54,7 +54,7 @@ import * as util from 'ionic/util'; */ @View({ template: - '' + + '' + '' + '
' + '
' + diff --git a/ionic/components/checkbox/checkbox.ts b/ionic/components/checkbox/checkbox.ts index 6ba1d362bc..69c63e7f1b 100644 --- a/ionic/components/checkbox/checkbox.ts +++ b/ionic/components/checkbox/checkbox.ts @@ -34,7 +34,7 @@ import {IonicComponent, IonicView} from '../../config/decorators'; 'id' ], host: { - 'class': 'item no-activated', + 'class': 'item', 'role': 'checkbox', 'tappable': 'true', '[attr.tab-index]': 'tabIndex', @@ -46,9 +46,9 @@ import {IonicComponent, IonicView} from '../../config/decorators'; }) @IonicView({ template: - '
' + - '
' + - '
' + + '' + + '' + + '' + '' + '' + '' diff --git a/ionic/components/checkbox/modes/ios.scss b/ionic/components/checkbox/modes/ios.scss index 6aed07f94a..9bc96d009b 100644 --- a/ionic/components/checkbox/modes/ios.scss +++ b/ionic/components/checkbox/modes/ios.scss @@ -12,12 +12,12 @@ $checkbox-ios-checkmark-color-on: $background-color !default; ion-checkbox { - &[aria-checked=true] .checkbox-icon { + &[aria-checked=true] checkbox-icon { background-color: $checkbox-ios-background-color-on; border-color: $checkbox-ios-border-color-on; } - &[aria-checked=true] .checkbox-icon:after { + &[aria-checked=true] checkbox-icon:after { position: absolute; border: 1px solid $checkbox-ios-checkmark-color-on; top: 3px; @@ -32,8 +32,14 @@ ion-checkbox { } -.checkbox-icon { +media-checkbox { + display: block; + margin: $item-ios-padding-media-top ($item-ios-padding-right / 2) $item-ios-padding-media-bottom ($item-ios-padding-left / 2); +} + +checkbox-icon { position: relative; + display: block; width: $checkbox-ios-icon-size; height: $checkbox-ios-icon-size; border-radius: 50%; @@ -47,7 +53,7 @@ ion-checkbox { @mixin checkbox-theme-ios($color-name, $bg-on) { - ion-checkbox[#{$color-name}][aria-checked=true] .checkbox-icon { + ion-checkbox[#{$color-name}][aria-checked=true] checkbox-icon { background-color: $bg-on; border-color: $bg-on; } diff --git a/ionic/components/checkbox/modes/md.scss b/ionic/components/checkbox/modes/md.scss index efe7796260..85c3b492c2 100644 --- a/ionic/components/checkbox/modes/md.scss +++ b/ionic/components/checkbox/modes/md.scss @@ -14,12 +14,12 @@ $checkbox-md-checkmark-color-on: $background-color !default; ion-checkbox { - &[aria-checked=true] .checkbox-icon { + &[aria-checked=true] checkbox-icon { background-color: $checkbox-md-background-color-on; border-color: $checkbox-md-border-color-on; } - &[aria-checked=true] .checkbox-icon:after { + &[aria-checked=true] checkbox-icon:after { position: absolute; border: 2px solid $checkbox-md-checkmark-color-on; top: 0; @@ -34,8 +34,14 @@ ion-checkbox { } -.checkbox-icon { +media-checkbox { + display: block; + margin: $item-md-padding-media-top ($item-md-padding-right / 2) $item-md-padding-media-bottom ($item-md-padding-left / 2); +} + +checkbox-icon { position: relative; + display: block; width: $checkbox-md-icon-size; height: $checkbox-md-icon-size; border-radius: $checkbox-md-border-radius; @@ -49,7 +55,7 @@ ion-checkbox { @mixin checkbox-theme-md($color-name, $bg-on) { - ion-checkbox[#{$color-name}][aria-checked=true] .checkbox-icon { + ion-checkbox[#{$color-name}][aria-checked=true] checkbox-icon { background-color: $bg-on; border-color: $bg-on; } diff --git a/ionic/components/item/modes/ios.scss b/ionic/components/item/modes/ios.scss index 2209d9e677..ac60f75c89 100644 --- a/ionic/components/item/modes/ios.scss +++ b/ionic/components/item/modes/ios.scss @@ -139,7 +139,7 @@ $item-ios-forward-icon-color: $item-ios-border-color !default; } -.item.activated:not(.no-activated) { +.item.activated { background-color: $item-ios-activated-background-color; } diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts index 337658db56..ebcea5fa56 100644 --- a/ionic/components/popup/popup.ts +++ b/ionic/components/popup/popup.ts @@ -16,17 +16,17 @@ import * as util from 'ionic/util'; * @usage * ```ts * class myApp { - * + * * constructor(popup: Popup) { * this.popup = popup; * } - * + * * doAlert() { * this.popup.alert('Alert').then(() => { * console.log('Alert closed'); * }); * } - * + * * doPrompt() { * this.popup.prompt('What is your name?').then((name) => { * console.log('Name entered:', name); @@ -34,7 +34,7 @@ import * as util from 'ionic/util'; * console.error('Prompt closed'); * }); * } - * + * * doConfirm() { * this.popup.confirm('Are you sure?').then((result, ev) => { * console.log('Confirmed!', result); @@ -198,7 +198,7 @@ const OVERLAY_TYPE = 'popup'; }) @View({ template: - '' + + '' + '' + '