From ab043d50ba13b5a618dee016cc17fdd0cfd916fa Mon Sep 17 00:00:00 2001 From: Jaalah Ramos Date: Tue, 1 Apr 2025 10:43:25 -0400 Subject: [PATCH 1/2] fix: [M3-9700] - Fix chevron issues with user menu --- packages/manager/src/assets/icons/chevron-down.svg | 3 --- packages/manager/src/assets/icons/chevron-up.svg | 3 --- packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx | 4 ++-- packages/ui/src/assets/icons/chevron-up.svg | 3 +++ packages/ui/src/assets/icons/index.ts | 1 + 5 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 packages/manager/src/assets/icons/chevron-down.svg delete mode 100644 packages/manager/src/assets/icons/chevron-up.svg create mode 100644 packages/ui/src/assets/icons/chevron-up.svg diff --git a/packages/manager/src/assets/icons/chevron-down.svg b/packages/manager/src/assets/icons/chevron-down.svg deleted file mode 100644 index 2b25af7401d..00000000000 --- a/packages/manager/src/assets/icons/chevron-down.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/manager/src/assets/icons/chevron-up.svg b/packages/manager/src/assets/icons/chevron-up.svg deleted file mode 100644 index 79281e16a34..00000000000 --- a/packages/manager/src/assets/icons/chevron-up.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx b/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx index 1d6269981b0..f548f05973d 100644 --- a/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx +++ b/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx @@ -1,6 +1,7 @@ import { Button, ChevronDownIcon, + ChevronUpIcon, Stack, Tooltip, Typography, @@ -12,7 +13,6 @@ import { useTheme } from '@mui/material/styles'; import { useSnackbar } from 'notistack'; import * as React from 'react'; -import ChevronUp from 'src/assets/icons/chevron-up.svg'; import { Avatar } from 'src/components/Avatar/Avatar'; import { AvatarForProxy } from 'src/components/AvatarForProxy'; import { SwitchAccountDrawer } from 'src/features/Account/SwitchAccountDrawer'; @@ -81,7 +81,7 @@ export const UserMenu = React.memo(() => { return undefined; } return open ? ( - + ) : ( + + diff --git a/packages/ui/src/assets/icons/index.ts b/packages/ui/src/assets/icons/index.ts index 8cd516084a3..fe3a598fa29 100644 --- a/packages/ui/src/assets/icons/index.ts +++ b/packages/ui/src/assets/icons/index.ts @@ -4,6 +4,7 @@ export { default as CheckboxIcon } from './checkbox.svg'; export { default as CheckboxCheckedIcon } from './checkboxChecked.svg'; export { default as CheckboxIndeterminateIcon } from './checkboxIndeterminate.svg'; export { default as ChevronDownIcon } from './chevron-down.svg'; +export { default as ChevronUpIcon } from './chevron-up.svg'; export { default as CloseIcon } from './close.svg'; export { default as InfoIcon } from './info.svg'; export { default as PendingIcon } from './pending.svg'; From 385c8a27b294228793286125a991d98c59662a32 Mon Sep 17 00:00:00 2001 From: Jaalah Ramos Date: Tue, 1 Apr 2025 11:04:42 -0400 Subject: [PATCH 2/2] Minor updates --- packages/manager/.changeset/pr-11946-fixed-1743519262429.md | 5 +++++ packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx | 6 +++++- packages/ui/.changeset/pr-11946-added-1743519284653.md | 5 +++++ packages/ui/src/assets/icons/chevron-up.svg | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 packages/manager/.changeset/pr-11946-fixed-1743519262429.md create mode 100644 packages/ui/.changeset/pr-11946-added-1743519284653.md diff --git a/packages/manager/.changeset/pr-11946-fixed-1743519262429.md b/packages/manager/.changeset/pr-11946-fixed-1743519262429.md new file mode 100644 index 00000000000..427d4ae3556 --- /dev/null +++ b/packages/manager/.changeset/pr-11946-fixed-1743519262429.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Fixed +--- + +Profile Menu Icon Size Inconsistency ([#11946](https://github.com/linode/manager/pull/11946)) diff --git a/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx b/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx index f548f05973d..67b5b1c47d8 100644 --- a/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx +++ b/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx @@ -1,3 +1,4 @@ +import { useAccount, useProfile } from '@linode/queries'; import { Button, ChevronDownIcon, @@ -16,7 +17,6 @@ import * as React from 'react'; import { Avatar } from 'src/components/Avatar/Avatar'; import { AvatarForProxy } from 'src/components/AvatarForProxy'; import { SwitchAccountDrawer } from 'src/features/Account/SwitchAccountDrawer'; -import { useAccount, useProfile } from '@linode/queries'; import { getStorage, setStorage } from 'src/utilities/storage'; import { UserMenuPopover } from './UserMenuPopover'; @@ -159,6 +159,10 @@ const StyledUserMenuButton = styled(Button, { color: theme.tokens.component.GlobalHeader.Text.Hover, }, }, + '.MuiButton-endIcon svg': { + height: '16px', + width: '16px', + }, '.MuiButton-icon svg': { color: open ? theme.tokens.component.GlobalHeader.Text.Hover diff --git a/packages/ui/.changeset/pr-11946-added-1743519284653.md b/packages/ui/.changeset/pr-11946-added-1743519284653.md new file mode 100644 index 00000000000..ac2821cc4ab --- /dev/null +++ b/packages/ui/.changeset/pr-11946-added-1743519284653.md @@ -0,0 +1,5 @@ +--- +"@linode/ui": Added +--- + +Chevron Up Icon ([#11946](https://github.com/linode/manager/pull/11946)) diff --git a/packages/ui/src/assets/icons/chevron-up.svg b/packages/ui/src/assets/icons/chevron-up.svg index b73a5f0b92c..77421075bf1 100644 --- a/packages/ui/src/assets/icons/chevron-up.svg +++ b/packages/ui/src/assets/icons/chevron-up.svg @@ -1,3 +1,3 @@ - +