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.

Sign up for GitHub

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

Jump to bottom

fix(Button): update typography tokens to match design #2019

Merged
merged 1 commit into from
Jul 17, 2024
Merged

fix(Button): update typography tokens to match design #2019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions .storybook/data/tokens.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
3 changes: 1 addition & 2 deletions src/components/Button/Button.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);;
Expand Down
8 changes: 4 additions & 4 deletions src/components/Card/Card.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ export const WithHorizontalPrimaryButton: Story = {
<ButtonGroup>
{/* This has to be manually tested since Tooltip tests are flaky in Chromatic */}
<Button onClick={() => {}} rank="primary">
Primary Action
Primary
</Button>
</ButtonGroup>
</Card.Footer>
Expand Down Expand Up @@ -264,7 +264,7 @@ export const TopStripe: Story = {
<ButtonGroup>
{/* This has to be manually tested since Tooltip tests are flaky in Chromatic */}
<Button onClick={() => {}} rank="primary">
Primary Action
Primary
</Button>
</ButtonGroup>
</Card.Footer>
Expand Down Expand Up @@ -296,7 +296,7 @@ export const CustomTopStripe: Story = {
<ButtonGroup>
{/* This has to be manually tested since Tooltip tests are flaky in Chromatic */}
<Button onClick={() => {}} rank="primary">
Primary Action
Primary
</Button>
</ButtonGroup>
</Card.Footer>
Expand Down Expand Up @@ -327,7 +327,7 @@ export const BackgroundCallout: Story = {
<ButtonGroup>
{/* This has to be manually tested since Tooltip tests are flaky in Chromatic */}
<Button onClick={() => {}} rank="primary">
Primary Action
Primary
</Button>
</ButtonGroup>
</Card.Footer>
Expand Down
8 changes: 4 additions & 4 deletions src/components/Card/__snapshots__/Card.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ exports[`<Card /> BackgroundCallout story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
</div>
Expand Down Expand Up @@ -387,7 +387,7 @@ exports[`<Card /> CustomTopStripe story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
</div>
Expand Down Expand Up @@ -576,7 +576,7 @@ exports[`<Card /> TopStripe story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
</div>
Expand Down Expand Up @@ -894,7 +894,7 @@ exports[`<Card /> WithHorizontalPrimaryButton story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
</div>
Expand Down
10 changes: 5 additions & 5 deletions src/components/Modal/Modal.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const Default: Story = {
<Modal.Footer>
<ButtonGroup>
<Button onClick={() => {}} rank="primary">
Primary Action
Primary
</Button>
<Button onClick={() => {}} rank="secondary">
Secondary
Expand Down Expand Up @@ -170,7 +170,7 @@ export const WithLongTextScrollable: StoryObj<InteractiveArgs> = {
<Modal.Footer>
<ButtonGroup>
<Button onClick={() => {}} rank="primary">
Primary Action
Primary
</Button>
<Button onClick={() => {}} rank="secondary">
Secondary
Expand Down Expand Up @@ -215,7 +215,7 @@ export const ContentDefault: Story = {
<Modal.Footer>
<ButtonGroup>
<Button onClick={() => {}} rank="primary">
Primary Action
Primary
</Button>
<Button onClick={() => {}} rank="secondary">
Secondary
Expand Down Expand Up @@ -301,7 +301,7 @@ export const LayoutVertical: Story = {
<Modal.Footer>
<ButtonGroup buttonLayout="vertical">
<Button isFullWidth onClick={() => {}} rank="primary">
Primary Action
Primary
</Button>
<Button isFullWidth onClick={() => {}} rank="secondary">
Secondary
Expand Down Expand Up @@ -344,7 +344,7 @@ export const LayoutVerticalWithTertiary: Story = {
<Modal.Footer>
<ButtonGroup buttonLayout="vertical">
<Button isFullWidth onClick={() => {}} rank="primary">
Primary Action
Primary
</Button>
<Button isFullWidth onClick={() => {}} rank="tertiary">
Tertiary
Expand Down
26 changes: 13 additions & 13 deletions src/components/Modal/__snapshots__/Modal.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ exports[`Modal ContentDefault story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
<button
Expand Down Expand Up @@ -164,7 +164,7 @@ exports[`Modal Default story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
<button
Expand Down Expand Up @@ -263,7 +263,7 @@ exports[`Modal HighEmphasis story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
<button
Expand Down Expand Up @@ -348,7 +348,7 @@ exports[`Modal Large story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
<button
Expand Down Expand Up @@ -432,7 +432,7 @@ exports[`Modal LargeAuto story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
<button
Expand Down Expand Up @@ -516,7 +516,7 @@ exports[`Modal LargeMax story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
<button
Expand Down Expand Up @@ -600,7 +600,7 @@ exports[`Modal LayoutVertical story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
<button
Expand Down Expand Up @@ -684,7 +684,7 @@ exports[`Modal LayoutVerticalWithTertiary story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
<button
Expand Down Expand Up @@ -768,7 +768,7 @@ exports[`Modal Mobile story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
<button
Expand Down Expand Up @@ -852,7 +852,7 @@ exports[`Modal MobileLandscape story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
<button
Expand Down Expand Up @@ -936,7 +936,7 @@ exports[`Modal Small story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
<button
Expand Down Expand Up @@ -1020,7 +1020,7 @@ exports[`Modal Tablet story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
<button
Expand Down Expand Up @@ -1238,7 +1238,7 @@ exports[`Modal WithLongTextScrollable story renders snapshot 1`] = `
<span
class="button__text"
>
Primary Action
Primary
</span>
</button>
<button
Expand Down
7 changes: 5 additions & 2 deletions src/design-tokens/tier-3-component/buttons-typography.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
"typography": {
"button": {
"lg": {
"value": "var(--eds-typography-preset-006)"
"value": "var(--eds-typography-preset-005)"
},
"md": {
"value": "var(--eds-typography-preset-006)"
"value": "var(--eds-typography-preset-005)"
},
"sm": {
"value": "var(--eds-typography-preset-009)"
},
"label": {
"@": {
Expand Down
5 changes: 3 additions & 2 deletions src/tokens-dist/css/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,9 @@
--eds-theme-typography-form-label: var(--eds-typography-preset-006);
--eds-theme-typography-button-label-sm: var(--eds-typography-preset-008-bold); /* @deprecated This should not be used in code or design. It will be removed in a future version of EDS. */
--eds-theme-typography-button-label: var(--eds-typography-preset-006); /* @deprecated This should not be used in code or design. It will be removed in a future version of EDS. */
--eds-theme-typography-button-md: var(--eds-typography-preset-006);
--eds-theme-typography-button-lg: var(--eds-typography-preset-006);
--eds-theme-typography-button-sm: var(--eds-typography-preset-009);
--eds-theme-typography-button-md: var(--eds-typography-preset-005);
--eds-theme-typography-button-lg: var(--eds-typography-preset-005);
--eds-theme-typography-breadcrumb: var(--eds-typography-preset-009);
--eds-theme-typography-callout: var(--eds-typography-preset-002-light);
--eds-theme-typography-overline-sm: var(--eds-typography-preset-012);
Expand Down
5 changes: 3 additions & 2 deletions src/tokens-dist/json/variables-nested.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,9 @@
"callout": "var(--eds-typography-preset-002-light)",
"breadcrumb": "var(--eds-typography-preset-009)",
"button": {
"lg": "var(--eds-typography-preset-006)",
"md": "var(--eds-typography-preset-006)",
"lg": "var(--eds-typography-preset-005)",
"md": "var(--eds-typography-preset-005)",
"sm": "var(--eds-typography-preset-009)",
"label": {
"@": "var(--eds-typography-preset-006)",
"sm": "var(--eds-typography-preset-008-bold)"
Expand Down
Loading