Skip to content
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

Jump to bottom

Navigation Panel UI Sizing Changes #5964

Merged
merged 4 commits into from
Jun 21, 2024
Merged

Navigation Panel UI Sizing Changes #5964

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
a0af158
Added thai baht support
Ymirke Jun 15, 2024
a7573aa
Navigation Panel UI Updates
Ymirke Jun 19, 2024
d47ee5d
Merge branch 'twentyhq:main' into main
Ymirke Jun 19, 2024
f1e0428
Fixed design
lucasbordeau Jun 21, 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
7 changes: 4 additions & 3 deletions ...t/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand All @@ -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 }>`
Expand Down
2 changes: 1 addition & 1 deletion .../twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const StyledContainer = styled.div<{ isSubMenu?: boolean }>`
const StyledItemsContainer = styled.div`
display: flex;
flex-direction: column;
gap: ${({ theme }) => theme.spacing(8)};
gap: ${({ theme }) => theme.spacing(3)};
margin-bottom: auto;
overflow-y: auto;
`;
Expand Down
2 changes: 1 addition & 1 deletion ...src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)};
Expand Down
4 changes: 1 addition & 3 deletions ...y-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(6)};
padding: ${({ theme }) => theme.spacing(1)};
height: ${({ theme }) => theme.spacing(7)};
user-select: none;
`;

Expand Down
1 change: 1 addition & 0 deletions ...nty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const StyledItem = styled('div', {
align-items: center;
background: ${(props) =>
props.active ? props.theme.background.transparent.light : 'inherit'};
height: ${({ theme }) => theme.spacing(5)};
border: none;
border-radius: ${({ theme }) => theme.border.radius.sm};
text-decoration: none;
Expand Down
2 changes: 1 addition & 1 deletion ...t/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(4)};
height: ${({ theme }) => theme.spacing(5)};
padding: ${({ theme }) => theme.spacing(1)};

${({ onClick, theme }) =>
Expand Down
Loading