From 9d5133f27600e3c0b789786fb0859c581385241c Mon Sep 17 00:00:00 2001
From: Yash Raj Chhabra <ychhabra@eightfold.ai>
Date: Mon, 22 Aug 2022 17:40:16 +0530
Subject: [PATCH 1/2] fix: badge: fix font size

---
 src/components/Badge/Badge.tsx         | 1 -
 src/components/Badge/badge.module.scss | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Badge/Badge.tsx b/src/components/Badge/Badge.tsx
index 72894ca44..b484fb44d 100644
--- a/src/components/Badge/Badge.tsx
+++ b/src/components/Badge/Badge.tsx
@@ -14,7 +14,6 @@ export const Badge: FC<BadgeProps> = ({
 }) => {
     const badgeClasses: string = mergeClasses([
         styles.badge,
-        'header6',
         { [styles.disruptive]: disruptive },
         classNames,
         { [styles.active]: active },
diff --git a/src/components/Badge/badge.module.scss b/src/components/Badge/badge.module.scss
index b9ddedab6..c0ded8b07 100644
--- a/src/components/Badge/badge.module.scss
+++ b/src/components/Badge/badge.module.scss
@@ -1,4 +1,5 @@
 .badge {
+    @include octuple-h6();
     --bg: var(--grey-color-20);
     --label: var(--grey-color-80);
     background-color: var(--bg);

From 1aab4f9a9774ca0687c1cc70cb8e09a16e96a471 Mon Sep 17 00:00:00 2001
From: Yash Raj Chhabra <ychhabra@eightfold.ai>
Date: Mon, 22 Aug 2022 19:53:45 +0530
Subject: [PATCH 2/2] chore: update snapshots

---
 .../__snapshots__/Accordion.stories.storyshot    |  8 ++++----
 .../Badge/__snapshots__/Badge.stories.storyshot  |  6 +++---
 .../TwoStateButton.stories.storyshot             |  2 +-
 .../__snapshots__/Button.stories.storyshot       |  6 +++---
 .../Tabs/__snapshots__/Tabs.stories.storyshot    | 16 ++++++++--------
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/src/components/Accordion/__snapshots__/Accordion.stories.storyshot b/src/src/components/Accordion/__snapshots__/Accordion.stories.storyshot
index dac978396..eb9c2acb5 100644
--- a/src/src/components/Accordion/__snapshots__/Accordion.stories.storyshot
+++ b/src/src/components/Accordion/__snapshots__/Accordion.stories.storyshot
@@ -83,7 +83,7 @@ exports[`Storyshots Accordion List Horizontal 1`] = `
               Notification testing
             </div>
             <span
-              className="badge header6 active"
+              className="badge active"
             >
               2
             </span>
@@ -198,7 +198,7 @@ exports[`Storyshots Accordion List Horizontal 1`] = `
               Notification testing
             </div>
             <span
-              className="badge header6 active"
+              className="badge active"
             >
               12
             </span>
@@ -347,7 +347,7 @@ exports[`Storyshots Accordion List Vertical 1`] = `
               Notification testing
             </div>
             <span
-              className="badge header6 active"
+              className="badge active"
             >
               2
             </span>
@@ -462,7 +462,7 @@ exports[`Storyshots Accordion List Vertical 1`] = `
               Notification testing
             </div>
             <span
-              className="badge header6 active"
+              className="badge active"
             >
               12
             </span>
diff --git a/src/src/components/Badge/__snapshots__/Badge.stories.storyshot b/src/src/components/Badge/__snapshots__/Badge.stories.storyshot
index 1dca552b0..3a491019a 100644
--- a/src/src/components/Badge/__snapshots__/Badge.stories.storyshot
+++ b/src/src/components/Badge/__snapshots__/Badge.stories.storyshot
@@ -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
@@ -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
@@ -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
diff --git a/src/src/components/Button/TwoStateButton/__snapshots__/TwoStateButton.stories.storyshot b/src/src/components/Button/TwoStateButton/__snapshots__/TwoStateButton.stories.storyshot
index e0cb272ca..9e2777ac5 100644
--- a/src/src/components/Button/TwoStateButton/__snapshots__/TwoStateButton.stories.storyshot
+++ b/src/src/components/Button/TwoStateButton/__snapshots__/TwoStateButton.stories.storyshot
@@ -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>
diff --git a/src/src/components/Button/__snapshots__/Button.stories.storyshot b/src/src/components/Button/__snapshots__/Button.stories.storyshot
index ec555020f..098f3806f 100644
--- a/src/src/components/Button/__snapshots__/Button.stories.storyshot
+++ b/src/src/components/Button/__snapshots__/Button.stories.storyshot
@@ -45,7 +45,7 @@ exports[`Storyshots Button Counter 1`] = `
     >
       Primary Button
       <span
-        className="badge header6 counter"
+        className="badge counter"
       >
         8
       </span>
@@ -329,7 +329,7 @@ Array [
     >
       Split Button
       <span
-        className="badge header6 counter"
+        className="badge counter"
       >
         8
       </span>
@@ -524,7 +524,7 @@ exports[`Storyshots Button Toggle With Counter 1`] = `
     >
       Toggle Button
       <span
-        className="badge header6 counter"
+        className="badge counter"
       >
         8
       </span>
diff --git a/src/src/components/Tabs/__snapshots__/Tabs.stories.storyshot b/src/src/components/Tabs/__snapshots__/Tabs.stories.storyshot
index 79a773330..8f9f9130a 100644
--- a/src/src/components/Tabs/__snapshots__/Tabs.stories.storyshot
+++ b/src/src/components/Tabs/__snapshots__/Tabs.stories.storyshot
@@ -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>
@@ -831,7 +831,7 @@ exports[`Storyshots Tabs Pill With Badge 1`] = `
         Tab 2
       </span>
       <span
-        className="badge header6 badge"
+        className="badge badge"
       >
         2
       </span>
@@ -849,7 +849,7 @@ exports[`Storyshots Tabs Pill With Badge 1`] = `
         Tab 3
       </span>
       <span
-        className="badge header6 badge"
+        className="badge badge"
       >
         3
       </span>
@@ -868,7 +868,7 @@ exports[`Storyshots Tabs Pill With Badge 1`] = `
         Tab 4
       </span>
       <span
-        className="badge header6 badge"
+        className="badge badge"
       >
         4
       </span>
@@ -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>
@@ -1146,7 +1146,7 @@ exports[`Storyshots Tabs With Badge 1`] = `
         Tab 2
       </span>
       <span
-        className="badge header6 badge"
+        className="badge badge"
       >
         2
       </span>
@@ -1164,7 +1164,7 @@ exports[`Storyshots Tabs With Badge 1`] = `
         Tab 3
       </span>
       <span
-        className="badge header6 badge"
+        className="badge badge"
       >
         3
       </span>
@@ -1183,7 +1183,7 @@ exports[`Storyshots Tabs With Badge 1`] = `
         Tab 4
       </span>
       <span
-        className="badge header6 badge"
+        className="badge badge"
       >
         4
       </span>