Skip to content

Commit

Permalink
chore: update utility-base token numbering (#1974)
Browse files Browse the repository at this point in the history
change -0 and -1 to -1 and -2 respectively
  • Loading branch information
booc0mtaco authored Jun 5, 2024
1 parent 56066ae commit 76d467d
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .storybook/data/tokens.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@
"eds-theme-color-background-brand-purple": "#C580E7",
"eds-theme-color-background-brand-purple-low-emphasis": "#FBF5FD",
"eds-theme-color-background-brand-pink": "#DB458D",
"eds-theme-color-background-utility-base-0": "rgb(var(--eds-color-white) / 1)",
"eds-theme-color-background-utility-base-1": "#FDF9F8",
"eds-theme-color-background-utility-base-1": "rgb(var(--eds-color-white) / 1)",
"eds-theme-color-background-utility-base-2": "#FDF9F8",
"eds-theme-color-background-utility-container": "rgb(var(--eds-color-white) / 1)",
"eds-theme-color-background-utility-container-hover": "#F9F3F1",
"eds-theme-color-background-utility-container-active": "#EEE7E4",
Expand Down
4 changes: 2 additions & 2 deletions src/components/Button/Button-v2.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,13 @@

.button:focus-visible {
outline: none;
box-shadow: 0 0 0 0.125rem var(--eds-theme-color-background-utility-base-1), 0 0 0 0.25rem var(--eds-theme-color-border-utility-focus);
box-shadow: 0 0 0 0.125rem var(--eds-theme-color-background-utility-base-2), 0 0 0 0.25rem var(--eds-theme-color-border-utility-focus);
}

/* stylelint-disable-next-line eds/no-tier-1-color-variable */
.button.button--variant-inverse:focus-visible {
outline: none;
box-shadow: 0 0 0 0.125rem rgb(var(--eds-color-black) / 1), 0 0 0 0.25rem var(--eds-theme-color-background-utility-base-1);
box-shadow: 0 0 0 0.125rem rgb(var(--eds-color-black) / 1), 0 0 0 0.25rem var(--eds-theme-color-background-utility-base-2);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/design-tokens/themes.json
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,10 @@
},
"utility": {
"base": {
"0": {
"1": {
"value": "rgb(var(--eds-color-white) / 1)"
},
"1": {
"2": {
"value": "{eds.color.neutral.025}"
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/tokens-dist/css/variables.css
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
--eds-theme-color-background-utility-interactive-no-emphasis: transparent;
--eds-theme-color-background-utility-default-no-emphasis: transparent;
--eds-theme-color-background-utility-container: rgb(var(--eds-color-white) / 1);
--eds-theme-color-background-utility-base-0: rgb(var(--eds-color-white) / 1);
--eds-theme-color-background-utility-base-1: rgb(var(--eds-color-white) / 1);
--eds-theme-color-background-neutral-medium: #E7E8EA;
--eds-theme-color-background-neutral-subtle-hover: #E7E8EA;
--eds-theme-color-background-neutral-subtle: #F4F6F8; /* @deprecated This should not be used in code or design. It will be removed in a future version of EDS. */
Expand Down Expand Up @@ -745,7 +745,7 @@
--eds-theme-color-background-utility-overlay-low-emphasis: var(--eds-color-neutral-850); /* TODO-AH: color-mix with opacity 50% */
--eds-theme-color-background-utility-container-active: var(--eds-color-neutral-100);
--eds-theme-color-background-utility-container-hover: var(--eds-color-neutral-050);
--eds-theme-color-background-utility-base-1: var(--eds-color-neutral-025);
--eds-theme-color-background-utility-base-2: var(--eds-color-neutral-025);
--eds-theme-color-background-brand-pink: var(--eds-color-pink-450);
--eds-theme-color-background-brand-purple-low-emphasis: var(--eds-color-purple-050);
--eds-theme-color-background-brand-purple: var(--eds-color-purple-350);
Expand Down
4 changes: 2 additions & 2 deletions src/tokens-dist/json/variables-nested.json
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@
},
"utility": {
"base": {
"0": "rgb(var(--eds-color-white) / 1)",
"1": "#FDF9F8"
"1": "rgb(var(--eds-color-white) / 1)",
"2": "#FDF9F8"
},
"container": {
"@": "rgb(var(--eds-color-white) / 1)",
Expand Down
4 changes: 2 additions & 2 deletions src/tokens-dist/ts/colors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ export const EdsThemeColorBackgroundBrandBlueLowEmphasis = '#EAF4FF';
export const EdsThemeColorBackgroundBrandPurple = '#C580E7';
export const EdsThemeColorBackgroundBrandPurpleLowEmphasis = '#FBF5FD';
export const EdsThemeColorBackgroundBrandPink = '#DB458D';
export const EdsThemeColorBackgroundUtilityBase0 =
export const EdsThemeColorBackgroundUtilityBase1 =
'rgb(var(--eds-color-white) / 1)';
export const EdsThemeColorBackgroundUtilityBase1 = '#FDF9F8';
export const EdsThemeColorBackgroundUtilityBase2 = '#FDF9F8';
export const EdsThemeColorBackgroundUtilityContainer =
'rgb(var(--eds-color-white) / 1)';
export const EdsThemeColorBackgroundUtilityContainerHover = '#F9F3F1';
Expand Down

0 comments on commit 76d467d

Please sign in to comment.