Merge branch 'main' into sc-book-bookmark-icon

Codecademy · Nov 30, 2023 · 25ddc91 · 25ddc91
2 parents 5cc3b78 + 591e8ed
commit 25ddc91
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 11 deletions.
diff --git a/packages/gamut-kit/CHANGELOG.md b/packages/gamut-kit/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.6.369](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2023-11-30)
+
+**Note:** Version bump only for package @codecademy/gamut-kit
+
 ### [0.6.368](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2023-11-27)
 
 **Note:** Version bump only for package @codecademy/gamut-kit

diff --git a/packages/gamut-kit/package.json b/packages/gamut-kit/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@codecademy/gamut-kit",
   "description": "Styleguide & Component library for Codecademy",
-  "version": "0.6.368",
+  "version": "0.6.369",
   "author": "Codecademy Engineering <[email protected]>",
   "dependencies": {
-    "@codecademy/gamut": "55.10.4",
+    "@codecademy/gamut": "55.10.5",
     "@codecademy/gamut-icons": "9.11.1",
     "@codecademy/gamut-illustrations": "0.41.1",
     "@codecademy/gamut-patterns": "0.9.11",

diff --git a/packages/gamut/CHANGELOG.md b/packages/gamut/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [55.10.5](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2023-11-30)
+
+### Bug Fixes
+
+- **Badge:** color of secondary badges ([a9b41ba](https://github.com/Codecademy/gamut/commit/a9b41ba7e17c6a309e09067506ddc2a7ebdc7f44))
+
 ### [55.10.4](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2023-11-27)
 
 **Note:** Version bump only for package @codecademy/gamut

diff --git a/packages/gamut/package.json b/packages/gamut/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@codecademy/gamut",
   "description": "Styleguide & Component library for Codecademy",
-  "version": "55.10.4",
+  "version": "55.10.5",
   "author": "Codecademy Engineering <[email protected]>",
   "dependencies": {
     "@codecademy/gamut-icons": "9.11.1",

diff --git a/packages/gamut/src/Badge/index.tsx b/packages/gamut/src/Badge/index.tsx
@@ -25,7 +25,7 @@ const colorVariants = variant({
       textColor: 'navy',
     },
     secondary: {
-      bg: `text-disabled`,
+      bg: 'text-secondary',
       textColor: 'background',
     },
     tertiary: {

diff --git a/packages/styleguide/CHANGELOG.md b/packages/styleguide/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [66.8.5](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2023-11-30)
+
+### Bug Fixes
+
+- **Badge:** color of secondary badges ([a9b41ba](https://github.com/Codecademy/gamut/commit/a9b41ba7e17c6a309e09067506ddc2a7ebdc7f44))
+
 ### [66.8.4](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2023-11-27)
 
 **Note:** Version bump only for package @codecademy/styleguide

diff --git a/packages/styleguide/package.json b/packages/styleguide/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@codecademy/styleguide",
   "description": "Styleguide & Component library for codecademy.com",
-  "version": "66.8.4",
+  "version": "66.8.5",
   "author": "Codecademy Engineering",
   "dependencies": {
-    "@codecademy/gamut": "55.10.4",
+    "@codecademy/gamut": "55.10.5",
     "@codecademy/gamut-icons": "9.11.1",
     "@codecademy/gamut-illustrations": "0.41.1",
     "@codecademy/gamut-patterns": "0.9.11",

diff --git a/packages/styleguide/stories/Atoms/Badge.stories.mdx b/packages/styleguide/stories/Atoms/Badge.stories.mdx
@@ -65,13 +65,13 @@ We have two `size` options, which should be used according to their context:
 - Use `sm` when the `Badge` is inline with other components such as <LinkTo kind='Typography/Text'>Text</LinkTo>
 
 <Canvas>
-  <Story
-    name="default size"
-    args={{ variant: 'tertiary', children: 'default size' }}
-  >
+  <Story name="default size" args={{ children: 'default size' }}>
     {BadgeTemplate.bind({})}
   </Story>
-  <Story name="small" args={{ size: 'sm', children: 'sm size' }}>
+  <Story
+    name="small"
+    args={{ children: 'sm size', size: 'sm', variant: 'tertiary' }}
+  >
     {BadgeTemplate.bind({})}
   </Story>
 </Canvas>