Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: badge: fix font size #321

Merged
merged 2 commits into from
Aug 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/components/Badge/Badge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export const Badge: FC<BadgeProps> = ({
}) => {
const badgeClasses: string = mergeClasses([
styles.badge,
'header6',
{ [styles.disruptive]: disruptive },
classNames,
{ [styles.active]: active },
Expand Down
1 change: 1 addition & 0 deletions src/components/Badge/badge.module.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.badge {
@include octuple-h6();
--bg: var(--grey-color-20);
--label: var(--grey-color-80);
background-color: var(--bg);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ exports[`Storyshots Accordion List Horizontal 1`] = `
Notification testing
</div>
<span
className="badge header6 active"
className="badge active"
>
2
</span>
Expand Down Expand Up @@ -198,7 +198,7 @@ exports[`Storyshots Accordion List Horizontal 1`] = `
Notification testing
</div>
<span
className="badge header6 active"
className="badge active"
>
12
</span>
Expand Down Expand Up @@ -347,7 +347,7 @@ exports[`Storyshots Accordion List Vertical 1`] = `
Notification testing
</div>
<span
className="badge header6 active"
className="badge active"
>
2
</span>
Expand Down Expand Up @@ -462,7 +462,7 @@ exports[`Storyshots Accordion List Vertical 1`] = `
Notification testing
</div>
<span
className="badge header6 active"
className="badge active"
>
12
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`Storyshots Badge Badge Active 1`] = `
<span
className="badge header6 my-badge-class active"
className="badge my-badge-class active"
style={Object {}}
>
8
Expand All @@ -11,7 +11,7 @@ exports[`Storyshots Badge Badge Active 1`] = `

exports[`Storyshots Badge Badge Default 1`] = `
<span
className="badge header6 my-badge-class"
className="badge my-badge-class"
style={Object {}}
>
8
Expand All @@ -20,7 +20,7 @@ exports[`Storyshots Badge Badge Default 1`] = `

exports[`Storyshots Badge Badge Disruptive 1`] = `
<span
className="badge header6 disruptive my-badge-class active"
className="badge disruptive my-badge-class active"
style={Object {}}
>
8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ exports[`Storyshots Button Two State Button 1`] = `
Two State Button
</span>
<span
className="badge header6 counter"
className="badge counter"
>
8
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ exports[`Storyshots Button Counter 1`] = `
>
Primary Button
<span
className="badge header6 counter"
className="badge counter"
>
8
</span>
Expand Down Expand Up @@ -329,7 +329,7 @@ Array [
>
Split Button
<span
className="badge header6 counter"
className="badge counter"
>
8
</span>
Expand Down Expand Up @@ -524,7 +524,7 @@ exports[`Storyshots Button Toggle With Counter 1`] = `
>
Toggle Button
<span
className="badge header6 counter"
className="badge counter"
>
8
</span>
Expand Down
16 changes: 8 additions & 8 deletions src/src/components/Tabs/__snapshots__/Tabs.stories.storyshot
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ exports[`Storyshots Tabs Pill With Badge 1`] = `
data-portal-key="portal"
/>
<span
className="badge header6 badge active"
className="badge badge active"
>
1
</span>
Expand All @@ -831,7 +831,7 @@ exports[`Storyshots Tabs Pill With Badge 1`] = `
Tab 2
</span>
<span
className="badge header6 badge"
className="badge badge"
>
2
</span>
Expand All @@ -849,7 +849,7 @@ exports[`Storyshots Tabs Pill With Badge 1`] = `
Tab 3
</span>
<span
className="badge header6 badge"
className="badge badge"
>
3
</span>
Expand All @@ -868,7 +868,7 @@ exports[`Storyshots Tabs Pill With Badge 1`] = `
Tab 4
</span>
<span
className="badge header6 badge"
className="badge badge"
>
4
</span>
Expand Down Expand Up @@ -1128,7 +1128,7 @@ exports[`Storyshots Tabs With Badge 1`] = `
data-portal-key="portal"
/>
<span
className="badge header6 badge active"
className="badge badge active"
>
1
</span>
Expand All @@ -1146,7 +1146,7 @@ exports[`Storyshots Tabs With Badge 1`] = `
Tab 2
</span>
<span
className="badge header6 badge"
className="badge badge"
>
2
</span>
Expand All @@ -1164,7 +1164,7 @@ exports[`Storyshots Tabs With Badge 1`] = `
Tab 3
</span>
<span
className="badge header6 badge"
className="badge badge"
>
3
</span>
Expand All @@ -1183,7 +1183,7 @@ exports[`Storyshots Tabs With Badge 1`] = `
Tab 4
</span>
<span
className="badge header6 badge"
className="badge badge"
>
4
</span>
Expand Down