From 3797e490d7a7f14af986f0370e4ab2c46f078dd6 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 29 Sep 2015 08:39:29 -0500 Subject: [PATCH] fix(item): correct button.item activated color Closes #194 --- ionic/components/item/modes/md.scss | 11 ++++++----- ionic/components/switch/modes/ios.scss | 4 ++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss index f036a2b1c6..a0d240c633 100644 --- a/ionic/components/item/modes/md.scss +++ b/ionic/components/item/modes/md.scss @@ -59,10 +59,6 @@ $item-md-forward-icon-color: $item-md-border-color !default; &:last-child:after { left: 0; } - - &.activated { - background-color: $item-md-activated-background-color; - } } ion-header + .item:before { @@ -193,5 +189,10 @@ $item-md-forward-icon-color: $item-md-border-color !default; .item, a.item, button.item { - transition: background-color $button-md-transition-duration $button-md-animation-curve, + transition: background-color $button-md-transition-duration $button-md-animation-curve; + + &.activated { + background-color: $item-md-activated-background-color; + box-shadow: none; + } } diff --git a/ionic/components/switch/modes/ios.scss b/ionic/components/switch/modes/ios.scss index 915b88e6b4..6f11459999 100644 --- a/ionic/components/switch/modes/ios.scss +++ b/ionic/components/switch/modes/ios.scss @@ -24,6 +24,10 @@ $switch-ios-transition-duration: 300ms !default; ion-switch { + &.item.activated { + background: $list-background-color; + } + media-switch { padding: 6px ($item-ios-padding-right / 2) 6px ($item-ios-padding-left); }