Merge branch 'main' into cass-gm-1017-icon

Author: dreamwasp

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.480](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-kit@0.6.479...@codecademy/gamut-kit@0.6.480) (2025-02-28)
+
+**Note:** Version bump only for package @codecademy/gamut-kit
+
 ### [0.6.479](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-kit@0.6.478...@codecademy/gamut-kit@0.6.479) (2025-02-20)
 
 **Note:** Version bump only for package @codecademy/gamut-kit

packages/gamut-kit/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@codecademy/gamut-kit",
   "description": "Styleguide & Component library for Codecademy",
-  "version": "0.6.479",
+  "version": "0.6.480",
   "author": "Codecademy Engineering <dev@codecademy.com>",
   "dependencies": {
-    "@codecademy/gamut": "59.0.10",
+    "@codecademy/gamut": "59.0.11",
     "@codecademy/gamut-icons": "9.38.3",
     "@codecademy/gamut-illustrations": "0.53.3",
     "@codecademy/gamut-patterns": "0.10.6",

packages/gamut/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.
 
+### [59.0.11](https://github.com/Codecademy/gamut/compare/@codecademy/gamut@59.0.10...@codecademy/gamut@59.0.11) (2025-02-28)
+
+**Note:** Version bump only for package @codecademy/gamut
+
 ### [59.0.10](https://github.com/Codecademy/gamut/compare/@codecademy/gamut@59.0.9...@codecademy/gamut@59.0.10) (2025-02-20)
 
 ### Bug Fixes

packages/gamut/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@codecademy/gamut",
   "description": "Styleguide & Component library for Codecademy",
-  "version": "59.0.10",
+  "version": "59.0.11",
   "author": "Codecademy Engineering <dev@codecademy.com>",
   "dependencies": {
     "@codecademy/gamut-icons": "9.38.3",

packages/gamut/src/Anchor/index.tsx

@@ -120,7 +120,7 @@ export const Anchor = forwardRef<
       icon,
       iconOffset,
       iconPosition = 'left',
-      iconSize = 12,
+      iconSize = 16,
       iconAndTextGap = 8,
       isInlineIcon = true,
       variant = 'inline',

packages/gamut/src/Button/shared/InlineIconButton.tsx

@@ -13,6 +13,7 @@ type InlineIconButtonComponents =
 
 type InlineIconButtonType = InlineIconButtonComponents & {
   button: React.ComponentType<InlineIconButtonComponents>;
+  iconSize?: number;
 };
 
 export const InlineIconButton = forwardRef<
@@ -30,7 +31,12 @@ export const InlineIconButton = forwardRef<
     },
     ref
   ) => {
-    const content = appendIconToContent({ iconPosition, icon, children });
+    const content = appendIconToContent({
+      iconPosition,
+      icon,
+      iconSize: props.size === 'small' ? 12 : 16,
+      children,
+    });
     return (
       <Button {...props} variant={variant} ref={ref}>
         {content}

packages/styleguide/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.
 
+### [70.1.2](https://github.com/Codecademy/gamut/compare/@codecademy/styleguide@70.1.1...@codecademy/styleguide@70.1.2) (2025-02-28)
+
+**Note:** Version bump only for package @codecademy/styleguide
+
 ### [70.1.1](https://github.com/Codecademy/gamut/compare/@codecademy/styleguide@70.1.0...@codecademy/styleguide@70.1.1) (2025-02-10)
 
 **Note:** Version bump only for package @codecademy/styleguide

packages/styleguide/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@codecademy/styleguide",
   "description": "Styleguide & Component library for codecademy.com",
-  "version": "70.1.1",
+  "version": "70.1.2",
   "author": "Codecademy Engineering",
   "license": "MIT",
   "publishConfig": {

packages/styleguide/src/lib/Atoms/Buttons/Button/Button.stories.tsx

@@ -1,6 +1,7 @@
 import {
   Box,
   FillButton,
+  FlexBox,
   GridBox,
   IconButton,
   StrokeButton,
@@ -39,9 +40,9 @@ export const Secondary: Story = {
   },
 };
 
-const InlineIconsExample = () => {
-  return (
-    <GridBox gridTemplateColumns="1fr 1fr 1fr 3fr">
+export const InlineIcons: Story = {
+  render: () => (
+    <FlexBox row gap={16}>
       <FillButton maxWidth="fit-content" icon={MiniArrowLeftIcon}>
         FillButton
       </FillButton>
@@ -55,12 +56,8 @@ const InlineIconsExample = () => {
       >
         TextButton
       </TextButton>
-    </GridBox>
-  );
-};
-
-export const InlineIcons: Story = {
-  render: () => <InlineIconsExample />,
+    </FlexBox>
+  ),
 };
 
 const buttons = [FillButton, IconButton, StrokeButton, TextButton] as const;