diff --git a/front/src/modules/ui/layout/components/PageHeader.tsx b/front/src/modules/ui/layout/components/PageHeader.tsx index 63bef4e5d..7e0f48570 100644 --- a/front/src/modules/ui/layout/components/PageHeader.tsx +++ b/front/src/modules/ui/layout/components/PageHeader.tsx @@ -44,6 +44,7 @@ const StyledTitleContainer = styled.div` `; const StyledTopBarButtonContainer = styled.div` + margin-left: ${({ theme }) => theme.spacing(1)}; margin-right: ${({ theme }) => theme.spacing(1)}; `; @@ -51,11 +52,14 @@ const StyledBackIconButton = styled(IconButton)` margin-right: ${({ theme }) => theme.spacing(1)}; `; -const StyledTopBarIconStyledTitleContainer = styled.div` +const StyledTopBarIconStyledTitleContainer = styled.div<{ + hideLeftPadding?: boolean; +}>` align-items: center; display: flex; flex-direction: row; - padding-left: ${({ theme }) => theme.spacing(2)}; + padding-left: ${({ theme, hideLeftPadding }) => + hideLeftPadding ? theme.spacing(2) : undefined}; width: 100%; `; @@ -104,7 +108,7 @@ export function PageHeader({ /> )} - + {Icon && } diff --git a/front/src/modules/ui/navbar/components/NavCollapseButton.tsx b/front/src/modules/ui/navbar/components/NavCollapseButton.tsx index 591b99f2d..e3719fc62 100644 --- a/front/src/modules/ui/navbar/components/NavCollapseButton.tsx +++ b/front/src/modules/ui/navbar/components/NavCollapseButton.tsx @@ -7,7 +7,6 @@ import { IconLayoutSidebarRightCollapse, } from '@/ui/icon'; import { isNavbarOpenedState } from '@/ui/layout/states/isNavbarOpenedState'; -import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; const StyledCollapseButton = styled.div<{ hide: boolean; @@ -25,14 +24,14 @@ const StyledCollapseButton = styled.div<{ cursor: pointer; display: flex; - height: 32px; + height: 24px; justify-content: center; padding: 0; user-select: none; visibility: ${({ hide }) => (hide ? 'visible' : 'hidden')}; - width: 32px; + width: 24px; @keyframes fadeIn { 0% { @@ -56,7 +55,7 @@ export default function NavCollapseButton({ const [isNavbarOpened, setIsNavbarOpened] = useRecoilState(isNavbarOpenedState); - const iconSize = useIsMobile() ? 'small' : 'medium'; + const iconSize = 'small'; return ( <> diff --git a/front/src/modules/ui/navbar/components/NavItem.tsx b/front/src/modules/ui/navbar/components/NavItem.tsx index 3159e2fc1..ec866ba7f 100644 --- a/front/src/modules/ui/navbar/components/NavItem.tsx +++ b/front/src/modules/ui/navbar/components/NavItem.tsx @@ -134,7 +134,7 @@ function NavItem({ danger={danger} soon={soon} > - {Icon && } + {Icon && } {label} {soon && Soon} {!!count && {count}}