diff --git a/.storybook/data/tokens.json b/.storybook/data/tokens.json index 0d9e84a52..a61954921 100644 --- a/.storybook/data/tokens.json +++ b/.storybook/data/tokens.json @@ -132,8 +132,9 @@ "eds-theme-typography-overline-sm": "var(--eds-typography-preset-012)", "eds-theme-typography-callout": "var(--eds-typography-preset-002-light)", "eds-theme-typography-breadcrumb": "var(--eds-typography-preset-009)", - "eds-theme-typography-button-lg": "var(--eds-typography-preset-006)", - "eds-theme-typography-button-md": "var(--eds-typography-preset-006)", + "eds-theme-typography-button-lg": "var(--eds-typography-preset-005)", + "eds-theme-typography-button-md": "var(--eds-typography-preset-005)", + "eds-theme-typography-button-sm": "var(--eds-typography-preset-009)", "eds-theme-typography-button-label": "var(--eds-typography-preset-006)", "eds-theme-typography-button-label-sm": "var(--eds-typography-preset-008-bold)", "eds-theme-typography-form-label": "var(--eds-typography-preset-006)", diff --git a/src/components/Button/Button.module.css b/src/components/Button/Button.module.css index 2b3c2a3b6..cb907b1d5 100644 --- a/src/components/Button/Button.module.css +++ b/src/components/Button/Button.module.css @@ -87,8 +87,7 @@ .button--sm { padding: calc(var(--eds-size-half) / 16 * 1rem) 1.33333333rem; - /* TODO: need eds-theme-typography-button-sm => preset-009 */ - font: var(--eds-typography-preset-009); + font: var(--eds-theme-typography-button-sm); min-width: calc(var(--eds-size-6) / 16 * 1rem); max-width: calc(var(--eds-size-24) / 16 * 1rem);; diff --git a/src/components/Card/Card.stories.tsx b/src/components/Card/Card.stories.tsx index a7df01328..f15ef23b1 100644 --- a/src/components/Card/Card.stories.tsx +++ b/src/components/Card/Card.stories.tsx @@ -226,7 +226,7 @@ export const WithHorizontalPrimaryButton: Story = { {/* This has to be manually tested since Tooltip tests are flaky in Chromatic */} @@ -264,7 +264,7 @@ export const TopStripe: Story = { {/* This has to be manually tested since Tooltip tests are flaky in Chromatic */} @@ -296,7 +296,7 @@ export const CustomTopStripe: Story = { {/* This has to be manually tested since Tooltip tests are flaky in Chromatic */} @@ -327,7 +327,7 @@ export const BackgroundCallout: Story = { {/* This has to be manually tested since Tooltip tests are flaky in Chromatic */} diff --git a/src/components/Card/__snapshots__/Card.test.ts.snap b/src/components/Card/__snapshots__/Card.test.ts.snap index 3944a27a1..32e6d5a6b 100644 --- a/src/components/Card/__snapshots__/Card.test.ts.snap +++ b/src/components/Card/__snapshots__/Card.test.ts.snap @@ -87,7 +87,7 @@ exports[` BackgroundCallout story renders snapshot 1`] = ` - Primary Action + Primary @@ -387,7 +387,7 @@ exports[` CustomTopStripe story renders snapshot 1`] = ` - Primary Action + Primary @@ -576,7 +576,7 @@ exports[` TopStripe story renders snapshot 1`] = ` - Primary Action + Primary @@ -894,7 +894,7 @@ exports[` WithHorizontalPrimaryButton story renders snapshot 1`] = ` - Primary Action + Primary diff --git a/src/components/Modal/Modal.stories.tsx b/src/components/Modal/Modal.stories.tsx index cd50c4607..c0cb199a1 100644 --- a/src/components/Modal/Modal.stories.tsx +++ b/src/components/Modal/Modal.stories.tsx @@ -63,7 +63,7 @@ export const Default: Story = {