Skip to content

Commit 05716f9

Browse files
authored
fix(Badge): fix P+ styles for primary badges (#4753)
1 parent 4c4227d commit 05716f9

File tree

3 files changed

+24
-10
lines changed

3 files changed

+24
-10
lines changed

apps/docs/src/pages/components/badge.mdx

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,19 @@ To display a badge on any content, wrap the `children` content with the badge co
8686
Customize the badge’s color using the [`color`](/docs/styling#color-prop) prop.
8787

8888
```tsx live
89-
<div className="flex gap-sm">
90-
<HvBadge showCount label={8} icon={<Alert />} />
91-
<HvBadge color="primary" showCount label={8} icon={<Alert />} />
92-
<HvBadge color="bgPageSecondary" showCount label={8} icon={<Alert />} />
93-
<HvBadge color="positive" showCount label={8} icon={<Alert />} />
94-
<HvBadge color="coral" showCount label={8} icon={<Alert />} />
95-
<HvBadge color="#c73aa8" showCount label={8} icon={<Alert />} />
89+
<div className="flex flex-col gap-sm">
90+
<div className="flex gap-sm">
91+
<HvBadge showCount label={8} icon={<Alert />} />
92+
<HvBadge color="primary" showCount label={8} icon={<Alert />} />
93+
<HvBadge color="textSubtle" showCount label={8} icon={<Alert />} />
94+
<HvBadge color="positive" showCount label={8} icon={<Alert />} />
95+
</div>
96+
<div className="flex gap-sm">
97+
<HvBadge label={8} icon={<Alert />} />
98+
<HvBadge color="primary" label={8} icon={<Alert />} />
99+
<HvBadge color="textSubtle" label={8} icon={<Alert />} />
100+
<HvBadge color="positive" label={8} icon={<Alert />} />
101+
</div>
96102
</div>
97103
```
98104

packages/core/src/Badge/Badge.stories.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@ export const Test: StoryObj = {
108108
<HvBadge showCount label={8}>
109109
<HvTypography variant="title4">Events</HvTypography>
110110
</HvBadge>
111-
<HvBadge color="bgPageSecondary" showCount label={88} icon={<Alert />} />
111+
<HvBadge color="primary" showCount label={8} icon={<Alert />} />
112+
<HvBadge color="primary" label={8} icon={<Alert />} />
113+
<HvBadge color="textSubtle" showCount label={8} icon={<Alert />} />
114+
<HvBadge color="textSubtle" label={8} icon={<Alert />} />
112115
</div>
113116
),
114117
};

packages/styles/src/themes/pentahoPlus.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,13 @@ const pentahoPlus = makeTheme((theme) => ({
301301
classes: {
302302
badgePosition: {
303303
color: ld(theme.colors.textLight, theme.colors.textDark),
304-
"&[data-color='bgPageSecondary']": {
305-
color: theme.colors.text,
304+
"&[data-color='textSubtle']:not(.HvBadge-badgePosition:empty)": {
305+
color: theme.colors.textSubtle,
306+
backgroundColor: theme.colors.bgPageSecondary,
307+
},
308+
"&[data-color='primary']:not(.HvBadge-badgePosition:empty)": {
309+
color: theme.colors.primary,
310+
backgroundColor: theme.colors.primaryDimmed,
306311
},
307312
},
308313
},

0 commit comments

Comments
 (0)