From b472c6cd43c952b59573deda53896b07c1fee00a Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Fri, 29 Jan 2016 14:46:07 -0500 Subject: [PATCH] fix(badge): split badge color into separate modes make it so they can use a different badge by default per mode references #5222 --- ionic/components/badge/badge.ios.scss | 3 +++ ionic/components/badge/badge.md.scss | 5 ++++- ionic/components/badge/badge.scss | 4 ---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ionic/components/badge/badge.ios.scss b/ionic/components/badge/badge.ios.scss index b75be288c1..4e57d700b1 100644 --- a/ionic/components/badge/badge.ios.scss +++ b/ionic/components/badge/badge.ios.scss @@ -4,10 +4,13 @@ // -------------------------------------------------- $badge-ios-border-radius: 10px !default; +$badge-ios-background-color: map-get($colors-ios, primary) !default; ion-badge { border-radius: $badge-ios-border-radius; + background-color: $badge-ios-background-color; + color: inverse($badge-ios-background-color); } diff --git a/ionic/components/badge/badge.md.scss b/ionic/components/badge/badge.md.scss index 2be494f571..b8ef376c5b 100644 --- a/ionic/components/badge/badge.md.scss +++ b/ionic/components/badge/badge.md.scss @@ -3,11 +3,14 @@ // Material Design Badge // -------------------------------------------------- -$badge-md-border-radius: 4px !default; +$badge-md-border-radius: 4px !default; +$badge-md-background-color: map-get($colors-md, primary) !default; ion-badge { border-radius: $badge-md-border-radius; + background-color: $badge-md-background-color; + color: inverse($badge-md-background-color); } diff --git a/ionic/components/badge/badge.scss b/ionic/components/badge/badge.scss index 67d8866486..53e5a7aa96 100644 --- a/ionic/components/badge/badge.scss +++ b/ionic/components/badge/badge.scss @@ -5,7 +5,6 @@ $badge-font-size: 1.3rem !default; $badge-font-weight: bold !default; -$badge-background-color: map-get($colors, primary); ion-badge { @@ -22,9 +21,6 @@ ion-badge { font-weight: $badge-font-weight; line-height: 1; - background-color: $badge-background-color; - color: inverse($badge-background-color); - &:empty { display: none; }