Skip to content

Colored menu elements fix #984

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 4 commits into from
May 26, 2025
Merged

Colored menu elements fix #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73c6241
colored menu elements fix
Mar 24, 2025
f50fff2
Merge branch 'main' into menu-fix
germanosin Apr 2, 2025
928d7f5
Merge branch 'main' into menu-fix
germanosin May 26, 2025
9e2fa05
-8 margin
May 26, 2025
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
2 changes: 1 addition & 1 deletion frontend/src/components/Nav/Menu/MenuTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const MenuTab: FC<MenuTabProps> = ({
isOpen,
setColorKey,
}) => (
<S.MenuItem $variant="secondary" onClick={toggleClusterMenu}>
<S.MenuItem $variant="primary" onClick={toggleClusterMenu}>
<S.ContentWrapper>
<S.StatusIconWrapper>
<S.StatusIcon status={status} aria-label="status">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Nav/Menu/styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const MenuItem = styled('li').attrs({ role: 'menuitem' })<{

export const ContentWrapper = styled.div`
display: flex;
align-items: baseline;
align-items: center;
column-gap: 4px;
`;

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Nav/Nav.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const ClusterList = styled.ul.attrs<{ $colorKey: ClusterColorKey }>({
})`
border-radius: 8px;
padding: 4px 4px 4px 4px;
margin-bottom: 8px;
margin-bottom: -8px;
background-color: ${({ theme, $colorKey }) =>
theme.clusterMenu.backgroundColor[$colorKey]};
`;
8 changes: 4 additions & 4 deletions frontend/src/theme/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,14 +565,14 @@ export const theme = {
menu: {
primary: {
backgroundColor: {
normal: Colors.brand[0],
normal: 'transparent',
hover: hexToRgba(Colors.brand[95], 0.03),
active: hexToRgba(Colors.brand[95], 0.05),
},
color: {
normal: Colors.brand[80],
hover: Colors.brand[90],
active: Colors.brand[70],
normal: Colors.neutral[80],
hover: Colors.neutral[90],
active: Colors.neutral[95],
},
statusIconColor: {
online: Colors.green[40],
Expand Down
Loading