Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 0 deletions packages/manager/.changeset/pr-12728-changed-1755629789134.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Changed
---

Update `Table.HeaderNested.Icon` component to use new Default, Hover, and Active design tokens ([#12728](https://github.com/linode/manager/pull/12728))
2 changes: 1 addition & 1 deletion packages/manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@fontsource/nunito-sans": "^5.1.1",
"@hookform/resolvers": "3.9.1",
"@linode/api-v4": "workspace:*",
"@linode/design-language-system": "^4.0.0",
"@linode/design-language-system": "^5.0.0",
"@linode/queries": "workspace:*",
"@linode/search": "workspace:*",
"@linode/shared": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,12 @@ export const DisplayGroupedLinodes = (props: DisplayGroupedLinodesProps) => {
disableRipple
onClick={toggleGroupLinodes}
sx={(theme) => ({
':hover': {
color: theme.tokens.color.Brand[60],
':hover, :focus': {
color:
theme.tokens.component.Table.HeaderNested.Icon.Hover,
},
color: theme.tokens.component.Table.HeaderNested.Icon,
color:
theme.tokens.component.Table.HeaderNested.Icon.Default,
})}
>
<GroupByTag />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,14 @@ export const DisplayLinodes = React.memo((props: DisplayLinodesProps) => {
disableRipple
onClick={toggleGroupLinodes}
sx={(theme) => ({
':hover': {
color: theme.tokens.color.Brand[60],
':hover, :focus': {
color:
theme.tokens.component.Table.HeaderNested.Icon
.Hover,
},
color:
theme.tokens.component.Table.HeaderNested.Icon,
theme.tokens.component.Table.HeaderNested.Icon
.Default,
})}
>
<GroupByTag />
Expand Down
5 changes: 5 additions & 0 deletions packages/ui/.changeset/pr-12728-changed-1755629748985.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/ui": Changed
---

Update sort icon tokens to use separate Default, Hover, and Active tokens for each table header type ([#12728](https://github.com/linode/manager/pull/12728))
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@linode/design-language-system": "^4.0.0",
"@linode/design-language-system": "^5.0.0",
"@mui/icons-material": "^7.1.0",
"@mui/material": "^7.1.0",
"@mui/utils": "^7.1.0",
Expand Down
36 changes: 21 additions & 15 deletions packages/ui/src/foundations/themes/dark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,6 @@ const genericTableHeaderStyle = {
},
};

const MuiTableHeadSvgStyles = {
svg: {
path: {
fill: Color.Brand[60],
},
},
};

const MuiTableZebraHoverStyles = {
'&:not(.disabled-row)': {
'&.MuiTableRow-hover:hover, &.Mui-selected, &.Mui-selected:hover': {
Expand Down Expand Up @@ -1082,10 +1074,20 @@ export const darkTheme: ThemeOptions = {
},
// Icons in TH (i.e.: Summary View, Group by Tag)
'.MuiIconButton-root': {
'&.MuiIconButton-isActive': MuiTableHeadSvgStyles,
':hover': {
color: Color.Brand[60],
...MuiTableHeadSvgStyles,
'&.MuiIconButton-isActive': {
svg: {
path: {
fill: Table.HeaderNested.Icon.Active,
},
},
},
':hover, :focus': {
color: Table.HeaderNested.Icon.Hover,
svg: {
path: {
fill: Table.HeaderNested.Icon.Hover,
},
},
},
svg: {
path: {
Expand Down Expand Up @@ -1147,9 +1149,13 @@ export const darkTheme: ThemeOptions = {
'&.Mui-active': {
color: Table.HeaderNested.Text,
},
':hover': {
...MuiTableHeadSvgStyles,
color: Color.Brand[60],
':hover, :focus': {
color: Table.HeaderNested.Icon.Hover,
svg: {
path: {
fill: Table.HeaderNested.Icon.Hover,
},
},
},
svg: {
path: {
Expand Down
36 changes: 21 additions & 15 deletions packages/ui/src/foundations/themes/light.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,6 @@ const graphTransparency = '0.7';

const spacing = 8;

const MuiTableHeadSvgStyles = {
svg: {
path: {
fill: Color.Brand[90],
},
},
};

const MuiTableZebraHoverStyles = {
'&:not(.disabled-row)': {
'&.MuiTableRow-hover:hover, &.Mui-selected, &.Mui-selected:hover': {
Expand Down Expand Up @@ -1561,10 +1553,20 @@ export const lightTheme: ThemeOptions = {
},
// Icons in TH (i.e.: Summary View, Group by Tag)
'.MuiIconButton-root': {
'&.MuiIconButton-isActive': MuiTableHeadSvgStyles,
':hover': {
color: Color.Brand[60],
...MuiTableHeadSvgStyles,
'&.MuiIconButton-isActive': {
svg: {
path: {
fill: Table.HeaderNested.Icon.Active,
},
},
},
':hover, :focus': {
color: Table.HeaderNested.Icon.Hover,
svg: {
path: {
fill: Table.HeaderNested.Icon.Hover,
},
},
},
},
borderBottom: `1px solid ${Border.Normal}`,
Expand Down Expand Up @@ -1643,16 +1645,20 @@ export const lightTheme: ThemeOptions = {
color: Table.HeaderNested.Text,
},
':hover, :focus': {
...MuiTableHeadSvgStyles,
color: Color.Brand[90],
color: Table.HeaderNested.Icon.Hover,
cursor: 'pointer',
svg: {
path: {
fill: Table.HeaderNested.Icon.Hover,
},
},
},
fontSize: Font.FontSize.Xs,
svg: {
height: '16px',
margin: `0 ${Spacing.S4}`,
path: {
fill: Table.HeaderNested.Icon,
fill: Table.HeaderNested.Icon.Default,
},
width: '16px',
},
Expand Down
24 changes: 12 additions & 12 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.