Skip to content

Commit

Permalink
fix(badge): split badge color into separate modes
Browse files Browse the repository at this point in the history
make it so they can use a different badge by default per mode

references #5222
  • Loading branch information
brandyscarney committed Jan 29, 2016
1 parent 93b9891 commit b472c6c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
3 changes: 3 additions & 0 deletions ionic/components/badge/badge.ios.scss
Expand Up @@ -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);
}


Expand Down
5 changes: 4 additions & 1 deletion ionic/components/badge/badge.md.scss
Expand Up @@ -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);
}


Expand Down
4 changes: 0 additions & 4 deletions ionic/components/badge/badge.scss
Expand Up @@ -5,7 +5,6 @@

$badge-font-size: 1.3rem !default;
$badge-font-weight: bold !default;
$badge-background-color: map-get($colors, primary);


ion-badge {
Expand All @@ -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;
}
Expand Down

0 comments on commit b472c6c

Please sign in to comment.