diff --git a/ionic/components/checkbox/checkbox.scss b/ionic/components/checkbox/checkbox.scss index 8185a47c70..e99f95c1f9 100644 --- a/ionic/components/checkbox/checkbox.scss +++ b/ionic/components/checkbox/checkbox.scss @@ -3,12 +3,12 @@ // -------------------------------------------------- -.checkbox { +ion-checkbox { cursor: pointer; @include user-select-none(); } -.checkbox[aria-disabled=true] { +ion-checkbox[aria-disabled=true] { pointer-events: none; opacity: 0.5; color: $subdued-text-color; diff --git a/ionic/components/checkbox/checkbox.ts b/ionic/components/checkbox/checkbox.ts index 85fd212ce0..38599d1dcb 100644 --- a/ionic/components/checkbox/checkbox.ts +++ b/ionic/components/checkbox/checkbox.ts @@ -34,7 +34,7 @@ import {IonicComponent, IonicView} from '../../config/annotations'; 'id' ], host: { - 'class': 'item', + 'class': 'item no-activated', 'role': 'checkbox', 'tappable': 'true', '[attr.tab-index]': 'tabIndex', diff --git a/ionic/components/checkbox/modes/ios.scss b/ionic/components/checkbox/modes/ios.scss index 79cfb01098..6aed07f94a 100644 --- a/ionic/components/checkbox/modes/ios.scss +++ b/ionic/components/checkbox/modes/ios.scss @@ -10,7 +10,7 @@ $checkbox-ios-border-color-on: color(primary) !default; $checkbox-ios-checkmark-color-on: $background-color !default; -.checkbox { +ion-checkbox { &[aria-checked=true] .checkbox-icon { background-color: $checkbox-ios-background-color-on; @@ -30,10 +30,6 @@ $checkbox-ios-checkmark-color-on: $background-color !default; transform: rotate(45deg); } - &.item.activated { - background-color: inherit; - } - } .checkbox-icon { @@ -51,7 +47,7 @@ $checkbox-ios-checkmark-color-on: $background-color !default; @mixin checkbox-theme-ios($color-name, $bg-on) { - .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 cd6ded4f34..efe7796260 100644 --- a/ionic/components/checkbox/modes/md.scss +++ b/ionic/components/checkbox/modes/md.scss @@ -12,7 +12,7 @@ $checkbox-md-border-color-on: color(primary) !default; $checkbox-md-checkmark-color-on: $background-color !default; -.checkbox { +ion-checkbox { &[aria-checked=true] .checkbox-icon { background-color: $checkbox-md-background-color-on; @@ -49,7 +49,7 @@ $checkbox-md-checkmark-color-on: $background-color !default; @mixin checkbox-theme-md($color-name, $bg-on) { - .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 ac5640c7df..8ac55b7e5c 100644 --- a/ionic/components/item/modes/ios.scss +++ b/ionic/components/item/modes/ios.scss @@ -56,7 +56,7 @@ $item-ios-forward-icon-color: $item-ios-border-color !default; left: 0; } - &.activated { + &.activated:not(.no-activated) { background-color: $item-ios-activated-background-color; } }