From f1e04286c7f27fee622e3180851c7a5aedda40d9 Mon Sep 17 00:00:00 2001 From: Lucas Bordeau Date: Fri, 21 Jun 2024 16:46:49 +0200 Subject: [PATCH] Fixed design --- .../components/MultiWorkspaceDropdownButton.tsx | 7 ++++--- .../components/NavigationDrawerCollapseButton.tsx | 2 +- .../components/NavigationDrawerHeader.tsx | 2 -- .../navigation-drawer/components/NavigationDrawerItem.tsx | 2 +- .../components/NavigationDrawerSectionTitle.tsx | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx index 0249de11c093..23d356aa4fea 100644 --- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx +++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx @@ -33,10 +33,12 @@ const StyledContainer = styled.div` border: 1px solid transparent; display: flex; justify-content: space-between; - height: ${({ theme }) => theme.spacing(7)}; - padding: 0 ${({ theme }) => theme.spacing(2)}; + height: ${({ theme }) => theme.spacing(5)}; + padding: calc(${({ theme }) => theme.spacing(1)} - 1px); width: 100%; + gap: ${({ theme }) => theme.spacing(1)}; + &:hover { background-color: ${({ theme }) => theme.background.transparent.lighter}; border: 1px solid ${({ theme }) => theme.border.color.medium}; @@ -46,7 +48,6 @@ const StyledContainer = styled.div` const StyledLabel = styled.div` align-items: center; display: flex; - gap: ${({ theme }) => theme.spacing(2)}; `; const StyledIconChevronDown = styled(IconChevronDown)<{ disabled?: boolean }>` diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx index 856cb3041a88..d555a43599d9 100644 --- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx +++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx @@ -14,7 +14,7 @@ const StyledCollapseButton = styled.div` color: ${({ theme }) => theme.font.color.light}; cursor: pointer; display: flex; - height: ${({ theme }) => theme.spacing(6)}; + height: ${({ theme }) => theme.spacing(5)}; justify-content: center; user-select: none; width: ${({ theme }) => theme.spacing(6)}; diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx index b383d7c86377..72b384fb0c91 100644 --- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx +++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx @@ -12,9 +12,7 @@ import { NavigationDrawerCollapseButton } from './NavigationDrawerCollapseButton const StyledContainer = styled.div` align-items: center; display: flex; - gap: ${({ theme }) => theme.spacing(2)}; height: ${({ theme }) => theme.spacing(7)}; - padding: ${({ theme }) => theme.spacing(1)}; user-select: none; `; diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx index d63d44b57db4..d4f33fb82a1b 100644 --- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx +++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx @@ -39,7 +39,7 @@ const StyledItem = styled('div', { align-items: center; background: ${(props) => props.active ? props.theme.background.transparent.light : 'inherit'}; - height: ${({ theme }) => theme.spacing(7)}; + height: ${({ theme }) => theme.spacing(5)}; border: none; border-radius: ${({ theme }) => theme.border.radius.sm}; text-decoration: none; diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx index 1c8bfd20e988..4f8386e12d0f 100644 --- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx +++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx @@ -16,7 +16,7 @@ const StyledTitle = styled.div<{ onClick?: () => void }>` display: flex; font-size: ${({ theme }) => theme.font.size.xs}; font-weight: ${({ theme }) => theme.font.weight.semiBold}; - height: ${({ theme }) => theme.spacing(7)}; + height: ${({ theme }) => theme.spacing(5)}; padding: ${({ theme }) => theme.spacing(1)}; ${({ onClick, theme }) =>