Skip to content

chore(design-tokens): replace last batch legacy tokens #851

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

Merged
merged 16 commits into from
Apr 25, 2024
Merged

chore(design-tokens): replace last batch legacy tokens #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4672f9c
chore(design-tokens): replace tooltip legacy tokens
hebernardEquisoft Apr 22, 2024
4626491
chore(design-tokens): replace stories legacy tokens
hebernardEquisoft Apr 22, 2024
5178737
chore(design-tokens): replace global nav legacy tokens
hebernardEquisoft Apr 22, 2024
585261f
chore(design-tokens): replace combobox legacy tokens
hebernardEquisoft Apr 22, 2024
41bd858
chore(design-tokens): replace modal legacy tokens
hebernardEquisoft Apr 22, 2024
b772ad1
chore(design-tokens): replace table legacy tokens
hebernardEquisoft Apr 22, 2024
0c63c98
chore(design-tokens): add transparency tokens
hebernardEquisoft Apr 22, 2024
9b691a1
chore(design-tokens): add transparency tokens
hebernardEquisoft Apr 22, 2024
2e2193b
chore(design-tokens): replace final legacy tokens
hebernardEquisoft Apr 22, 2024
dd71f17
chore(design-tokens): update snapshots
hebernardEquisoft Apr 22, 2024
eeb3f41
Merge branch 'master' into dev/DS-1122
hebernardEquisoft Apr 22, 2024
d147ea2
chore(design-tokens): post review changes
hebernardEquisoft Apr 25, 2024
96ca258
Merge branch 'master' into dev/DS-1122
hebernardEquisoft Apr 25, 2024
f172494
chore(design-tokens): last last batch legacy
hebernardEquisoft Apr 25, 2024
000556d
Merge branch 'master' into dev/DS-1122
hebernardEquisoft Apr 25, 2024
5a9b7dd
chore(design-tokens): update snapshots
hebernardEquisoft Apr 25, 2024
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
6 changes: 3 additions & 3 deletions packages/react/src/components/bento-menu-button/bento-menu-button.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ exports[`BentoMenuButton Matches Snapshot (productGroups and externalLinks) 1`]
background-color: #FFFFFF;
border: 1px solid #60666E;
border-radius: var(--border-radius);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.19);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.2);
color: #000000;
list-style-type: none;
position: absolute;
Expand Down Expand Up @@ -919,7 +919,7 @@ exports[`BentoMenuButton Matches Snapshot (productLinks and externalLinks) 1`] =
background-color: #FFFFFF;
border: 1px solid #60666E;
border-radius: var(--border-radius);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.19);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.2);
color: #000000;
list-style-type: none;
position: absolute;
Expand Down Expand Up @@ -1651,7 +1651,7 @@ exports[`BentoMenuButton Matches Snapshot (tag="nav") 1`] = `
background-color: #FFFFFF;
border: 1px solid #60666E;
border-radius: var(--border-radius);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.19);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.2);
color: #000000;
list-style-type: none;
position: absolute;
Expand Down
9 changes: 4 additions & 5 deletions packages/react/src/components/combobox/combobox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,21 +103,20 @@ const ClearButton = styled(IconButton)<{ disabled?: boolean }>`
align-items: center;
background-color: transparent;
border: 0;
color: ${({ disabled, theme }) => (disabled ? theme.greys['mid-grey'] : theme.greys['dark-grey'])};
display: flex;
color: ${({ disabled, theme }) => (disabled ? theme.component['combobox-clear-button-disabled-icon-color'] : theme.component['combobox-clear-button-icon-color'])}; display: flex;
height: var(--size-1x);
padding: var(--spacing-half);
position: absolute;
right: calc(var(--size-1x) + var(--spacing-1halfx));
width: var(--size-1x);

&::after {
border-right: ${({ theme }) => `1px solid ${theme.greys['mid-grey']}`};
border-right: ${({ theme }) => `1px solid ${theme.component['combobox-clear-button-border-right-color']}`};
content: '';
height: calc(var(--size-2x) - var(--spacing-2x));
margin-left: var(--spacing-1x);
}

&:hover {
background-color: transparent;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/components/dropdown-menu-button/dropdown-menu-button.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ exports[`DropdownMenuButton Matches Snapshot (defaultOpen) 1`] = `
background-color: #FFFFFF;
border: 1px solid #60666E;
border-radius: var(--border-radius);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.19);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.2);
color: #000000;
list-style-type: none;
position: absolute;
Expand Down Expand Up @@ -1049,7 +1049,7 @@ exports[`DropdownMenuButton Matches Snapshot 1`] = `
background-color: #FFFFFF;
border: 1px solid #60666E;
border-radius: var(--border-radius);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.19);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.2);
color: #000000;
list-style-type: none;
position: absolute;
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/components/dropdown-menu/dropdown-menu.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`DropdownMenu Is hidden 1`] = `
background-color: #FFFFFF;
border: 1px solid #60666E;
border-radius: var(--border-radius);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.19);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.2);
color: #000000;
list-style-type: none;
position: absolute;
Expand Down Expand Up @@ -415,7 +415,7 @@ exports[`DropdownMenu Matches the snapshot 1`] = `
background-color: #FFFFFF;
border: 1px solid #60666E;
border-radius: var(--border-radius);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.19);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.2);
color: #000000;
list-style-type: none;
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/dropdown-menu/dropdown-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const List = styled.div`
background-color: ${({ theme }) => theme.component['dropdown-menu-background-color']};
border: 1px solid ${({ theme }) => theme.component['dropdown-menu-border-color']};
border-radius: var(--border-radius);
box-shadow: ${({ theme }) => theme.tokens['overlay-box-shadow']};
box-shadow: 0 10px 20px 0 ${({ theme }) => theme.component['dropdown-menu-box-shadow-color']};
color: ${({ theme }) => theme.component['dropdown-menu-text-color']};
list-style-type: none;
position: absolute;
Expand Down
9 changes: 6 additions & 3 deletions packages/react/src/components/dropdown-navigation/dropdown-navigation.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ exports[`DropdownNavigation Matches Snapshot (defaultOpen) 1`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
color: #000000;
color: #1B1C1E;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand All @@ -126,6 +126,7 @@ exports[`DropdownNavigation Matches Snapshot (defaultOpen) 1`] = `

.c7:hover {
background-color: #DBDEE1;
color: #000000;
}

.c7[disabled] {
Expand Down Expand Up @@ -361,7 +362,7 @@ exports[`DropdownNavigation Matches Snapshot (tag="nav") 1`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
color: #000000;
color: #1B1C1E;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand All @@ -388,6 +389,7 @@ exports[`DropdownNavigation Matches Snapshot (tag="nav") 1`] = `

.c7:hover {
background-color: #DBDEE1;
color: #000000;
}

.c7[disabled] {
Expand Down Expand Up @@ -624,7 +626,7 @@ exports[`DropdownNavigation Matches Snapshot 1`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
color: #000000;
color: #1B1C1E;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand All @@ -651,6 +653,7 @@ exports[`DropdownNavigation Matches Snapshot 1`] = `

.c7:hover {
background-color: #DBDEE1;
color: #000000;
}

.c7[disabled] {
Expand Down
8 changes: 4 additions & 4 deletions packages/react/src/components/global-navigation/global-navigation.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ exports[`Global Navigation matches snapshot 1`] = `

.c0 {
background-color: #FFFFFF;
box-shadow: 0 6px 10px 0 rgb(0 0 0 / 10%);
box-shadow: 0 10px 20px 0 rgb(0 0 0 / 0.2);
box-sizing: border-box;
display: -webkit-box;
display: -webkit-flex;
Expand Down Expand Up @@ -129,7 +129,6 @@ exports[`Global Navigation matches snapshot 1`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
background-color: transparent;
box-sizing: border-box;
color: #60666E;
display: -webkit-box;
Expand Down Expand Up @@ -187,7 +186,8 @@ exports[`Global Navigation matches snapshot 1`] = `

.c8.active {
background-color: #E0F0F9;
color: #000000;
color: #003A5A;
font-weight: var(--font-bold);
}

.c1 {
Expand All @@ -212,7 +212,7 @@ exports[`Global Navigation matches snapshot 1`] = `
}

.c10 {
background-color: #D9DDE2;
background-color: #DBDEE1;
border: 0;
height: 1px;
margin: var(--spacing-1x) auto;
Expand Down
32 changes: 15 additions & 17 deletions packages/react/src/components/global-navigation/global-navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@ import { eventIsInside } from '../../utils/events';
import { IconButton, IconButtonProps } from '../buttons/icon-button';
import { Icon, IconName } from '../icon/icon';

/* TODO change when updating thematization */
const lightBlue = '#E0F0F9';
const lightGrey = '#D9DDE2';

const Wrapper = styled.div`
background-color: ${({ theme }) => theme.greys.white};
box-shadow: 0 6px 10px 0 rgb(0 0 0 / 10%);
background-color: ${({ theme }) => theme.component['global-navigation-background-color']};
box-shadow: 0 10px 20px 0 ${({ theme }) => theme.component['global-navigation-box-shadow-color']};
box-sizing: border-box;
display: flex;
flex-direction: column;
Expand All @@ -32,7 +28,7 @@ const NavList = styled.ul`
`;

const MenuLink = styled(NavLink)`
color: ${({ theme }) => theme.greys.black};
color: ${({ theme }) => theme.component['global-navigation-item-text-color']};
display: flex;
flex-grow: 1;
line-height: 1.5rem;
Expand All @@ -43,18 +39,20 @@ const MenuLink = styled(NavLink)`
${focus};

&:hover {
background-color: ${(props) => props.theme.greys.grey};
background-color: ${({ theme }) => theme.component['global-navigation-item-hover-background-color']};
}

&.active {
background-color: ${({ theme }) => theme.component['global-navigation-item-selected-background-color']};
color: ${({ theme }) => theme.component['global-navigation-item-selected-text-color']};
font-weight: var(--font-bold);
}
`;

const ShowMoreMenu = styled.ul<{ open?: boolean }>`
background-color: ${(props) => props.theme.greys.white};
background-color: ${({ theme }) => theme.component['global-navigation-background-color']};
border-radius: var(--border-radius);
box-shadow: 0 6px 10px 0 rgb(0 0 0 / 10%);
box-shadow: 0 10px 20px 0 ${({ theme }) => theme.component['global-navigation-box-shadow-color']};
display: ${({ open }) => (open ? 'flex' : 'none')};
flex-wrap: wrap;
left: 4.5rem;
Expand All @@ -80,9 +78,8 @@ const ShowMoreMenu = styled.ul<{ open?: boolean }>`

const ShowMore = styled.button<{ active?: boolean }>`
align-items: center;
background-color: ${({ active, theme }) => (active ? theme.greys.grey : 'transparent')};
box-sizing: border-box;
color: ${({ theme }) => theme.greys['dark-grey']};
color: ${({ theme }) => theme.component['global-navigation-item-text-color']};
display: flex;
justify-content: center;
min-height: var(--size-3halfx);
Expand All @@ -92,8 +89,8 @@ const ShowMore = styled.button<{ active?: boolean }>`
${focus};

&:hover {
background-color: ${(props) => props.theme.greys.grey};
color: ${(props) => props.theme.greys.black};
background-color: ${({ theme }) => theme.component['global-navigation-item-hover-background-color']};
color: ${({ theme }) => theme.component['global-navigation-item-hover-text-color']};
}
`;

Expand All @@ -115,8 +112,9 @@ const ItemLink = styled(ShowMore).attrs({ as: NavLink })<NavLinkProps>`
text-decoration: none;

&.active {
background-color: ${lightBlue};
color: ${(props) => props.theme.greys.black};
background-color: ${({ theme }) => theme.component['global-navigation-item-selected-background-color']};
color: ${({ theme }) => theme.component['global-navigation-item-selected-text-color']};
font-weight: var(--font-bold);
}
`;

Expand All @@ -136,7 +134,7 @@ const ItemSpan = styled.span`
const separatorHeight = 17;
const separatorMargins = 16;
const Separator = styled.hr`
background-color: ${lightGrey};
background-color: ${({ theme }) => theme.component['global-navigation-separator-border-color']};
border: 0;
height: ${separatorHeight - separatorMargins}px;
margin: var(--spacing-1x) auto;
Expand Down
28 changes: 20 additions & 8 deletions packages/react/src/components/menu/menu.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`Menu matches the snapshot (menu with groups) 1`] = `
background-color: #FFFFFF;
border: 1px solid #878F9A;
border-radius: var(--border-radius);
box-shadow: 0 8px 16px 0 rgb(0 0 0 / 0.1);
box-shadow: 0 8px 16px 0 rgb(0 0 0 / 0.2);
box-sizing: border-box;
-webkit-flex-direction: column;
-ms-flex-direction: column;
Expand All @@ -26,7 +26,7 @@ exports[`Menu matches the snapshot (menu with groups) 1`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
color: #000000;
color: #1B1C1E;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand Down Expand Up @@ -54,6 +54,7 @@ exports[`Menu matches the snapshot (menu with groups) 1`] = `

.c2:hover {
background-color: #DBDEE1;
color: #000000;
}

.c2[disabled],
Expand Down Expand Up @@ -173,7 +174,7 @@ exports[`Menu matches the snapshot (menu with icons) 1`] = `
background-color: #FFFFFF;
border: 1px solid #878F9A;
border-radius: var(--border-radius);
box-shadow: 0 8px 16px 0 rgb(0 0 0 / 0.1);
box-shadow: 0 8px 16px 0 rgb(0 0 0 / 0.2);
box-sizing: border-box;
-webkit-flex-direction: column;
-ms-flex-direction: column;
Expand All @@ -194,7 +195,7 @@ exports[`Menu matches the snapshot (menu with icons) 1`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
color: #000000;
color: #1B1C1E;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand Down Expand Up @@ -222,6 +223,7 @@ exports[`Menu matches the snapshot (menu with icons) 1`] = `

.c1:hover {
background-color: #DBDEE1;
color: #000000;
}

.c1[disabled],
Expand All @@ -233,6 +235,14 @@ exports[`Menu matches the snapshot (menu with icons) 1`] = `
}

.c2 {
color: #1B1C1E;
}

.c2:hover {
color: #000000;
}

.c3 {
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
-ms-flex-positive: 1;
Expand All @@ -257,13 +267,14 @@ exports[`Menu matches the snapshot (menu with icons) 1`] = `
>
<svg
aria-hidden="true"
color="#60666E"
class="c2"
color="currentColor"
focusable="false"
height="1rem"
width="1rem"
/>
<span
class="c2"
class="c3"
>
Option 1
</span>
Expand All @@ -277,13 +288,14 @@ exports[`Menu matches the snapshot (menu with icons) 1`] = `
>
<svg
aria-hidden="true"
color="#60666E"
class="c2"
color="currentColor"
focusable="false"
height="1rem"
width="1rem"
/>
<span
class="c2"
class="c3"
>
Option 2
</span>
Expand Down
Loading
Loading