Skip to content

Commit 7d9352e

Browse files
committed
refactor(badge): only apply the color / background to hue classes
1 parent 02ece96 commit 7d9352e

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

core/src/components/badge/badge.common.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@
4343
vertical-align: baseline;
4444
}
4545

46-
:host(.ion-color) {
47-
background: #{color.current-color(base)};
48-
color: #{color.current-color(contrast)};
49-
}
50-
5146
// Badge (hint)
5247
// --------------------------------------------------
5348

core/src/components/badge/badge.ionic.scss

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
// --------------------------------------------------
66

77
:host {
8-
--background: #{globals.ion-color(primary, base)};
9-
--color: #{globals.ion-color(primary, contrast)};
108
--padding-start: #{globals.$ion-space-200};
119
--padding-end: #{globals.$ion-space-200};
1210
--padding-top: #{globals.$ion-space-0};
@@ -20,12 +18,24 @@
2018
font-weight: globals.$ion-font-weight-medium;
2119
}
2220

21+
// Bold Badge
22+
// --------------------------------------------------
23+
24+
:host(.badge-bold) {
25+
--background: #{globals.ion-color(primary, base)};
26+
--color: #{globals.ion-color(primary, contrast)};
27+
}
28+
29+
:host(.badge-bold.ion-color) {
30+
background: globals.current-color(base);
31+
color: globals.current-color(contrast);
32+
}
33+
2334
// Subtle Badge
2435
// --------------------------------------------------
2536

2637
:host(.badge-subtle) {
2738
--background: #{globals.ion-color(primary, base, $subtle: true)};
28-
--background-activated: #{globals.ion-color(primary, shade, $subtle: true)};
2939
--color: #{globals.ion-color(primary, contrast, $subtle: true)};
3040
}
3141

core/src/components/badge/badge.native.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
font-family: $font-family-base;
1313
}
1414

15+
:host(.ion-color) {
16+
background: current-color(base);
17+
color: current-color(contrast);
18+
}
19+
1520
// TODO(ROU-10747): Review size styles when sizes are defined for native themes.
1621
:host([vertical]:not(.in-button):not(.in-tab-button)),
1722
:host(:empty) {

core/src/components/badge/test/hue/index.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
<ion-content id="content">
2626
<h2>Badge Hue: Subtle</h2>
27+
<ion-badge>99</ion-badge>
2728
<ion-badge color="primary">99</ion-badge>
2829
<ion-badge color="secondary">99</ion-badge>
2930
<ion-badge color="tertiary">99</ion-badge>
@@ -36,6 +37,7 @@ <h2>Badge Hue: Subtle</h2>
3637

3738
<br />
3839

40+
<ion-badge><ion-icon name="logo-ionic"></ion-icon></ion-badge>
3941
<ion-badge color="primary"><ion-icon name="logo-ionic"></ion-icon></ion-badge>
4042
<ion-badge color="secondary"><ion-icon name="logo-ionic"></ion-icon></ion-badge>
4143
<ion-badge color="tertiary"><ion-icon name="logo-ionic"></ion-icon></ion-badge>
@@ -47,6 +49,7 @@ <h2>Badge Hue: Subtle</h2>
4749
<ion-badge color="dark"><ion-icon name="logo-ionic"></ion-icon></ion-badge>
4850

4951
<h2>Badge Hue: Bold</h2>
52+
<ion-badge hue="bold">99</ion-badge>
5053
<ion-badge hue="bold" color="primary">99</ion-badge>
5154
<ion-badge hue="bold" color="secondary">99</ion-badge>
5255
<ion-badge hue="bold" color="tertiary">99</ion-badge>
@@ -59,6 +62,7 @@ <h2>Badge Hue: Bold</h2>
5962

6063
<br />
6164

65+
<ion-badge hue="bold"><ion-icon name="logo-ionic"></ion-icon></ion-badge>
6266
<ion-badge hue="bold" color="primary"><ion-icon name="logo-ionic"></ion-icon></ion-badge>
6367
<ion-badge hue="bold" color="secondary"><ion-icon name="logo-ionic"></ion-icon></ion-badge>
6468
<ion-badge hue="bold" color="tertiary"><ion-icon name="logo-ionic"></ion-icon></ion-badge>

0 commit comments

Comments
 (0)