From f257a50265fe67ce20210d5001fb1cb0519984e0 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Mon, 7 Dec 2015 16:26:00 -0500 Subject: [PATCH] refactor(radio): moved disable color to modes so it is easier to override references #689 --- ionic/components/radio/modes/ios.scss | 7 +++++++ ionic/components/radio/modes/md.scss | 6 ++++++ ionic/components/radio/radio.scss | 2 -- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ionic/components/radio/modes/ios.scss b/ionic/components/radio/modes/ios.scss index 828c72f4d1..66f2dccd99 100644 --- a/ionic/components/radio/modes/ios.scss +++ b/ionic/components/radio/modes/ios.scss @@ -11,6 +11,9 @@ $radio-ios-icon-height: 21px !default; $radio-ios-icon-border-width: 2px !default; $radio-ios-icon-border-style: solid !default; +$radio-ios-disabled-text-color: $subdued-text-ios-color !default; + + ion-radio { &[aria-checked=true] { @@ -38,6 +41,10 @@ ion-radio { } +ion-radio[aria-disabled=true] { + color: $radio-ios-disabled-text-color; +} + .radio-media { display: block; margin: $item-ios-padding-media-top ($item-ios-padding-right / 2) $item-ios-padding-media-bottom ($item-ios-padding-left / 2); diff --git a/ionic/components/radio/modes/md.scss b/ionic/components/radio/modes/md.scss index bf65f50332..cdf484c72d 100644 --- a/ionic/components/radio/modes/md.scss +++ b/ionic/components/radio/modes/md.scss @@ -16,6 +16,8 @@ $radio-md-icon-border-radius: 50% !default; $radio-md-transition-duration: 280ms !default; $radio-md-transition-easing: cubic-bezier(.4, 0, .2, 1) !default; +$radio-md-disabled-text-color: $subdued-text-md-color !default; + ion-radio { @@ -33,6 +35,10 @@ ion-radio { } +ion-radio[aria-disabled=true] { + color: $radio-md-disabled-text-color; +} + .radio-icon { position: relative; top: 0; diff --git a/ionic/components/radio/radio.scss b/ionic/components/radio/radio.scss index 3bfc2f3f90..d164a64855 100644 --- a/ionic/components/radio/radio.scss +++ b/ionic/components/radio/radio.scss @@ -4,7 +4,6 @@ // -------------------------------------------------- $radio-disabled-opacity: 0.5 !default; -$radio-disabled-text-color: $subdued-text-color !default; ion-radio { @@ -14,6 +13,5 @@ ion-radio { ion-radio[aria-disabled=true] { opacity: $radio-disabled-opacity; - color: $radio-disabled-text-color; pointer-events: none; }