* padding fix for header container * collapse menu hover and fade transition added * Update front/src/modules/ui/navbar/components/NavWorkspaceButton.tsx Co-authored-by: Emilien Chauvet <emilien.chauvet.enpc@gmail.com> * Update front/src/modules/ui/navbar/components/NavWorkspaceButton.tsx Co-authored-by: Emilien Chauvet <emilien.chauvet.enpc@gmail.com> * Update front/src/modules/ui/navbar/components/NavCollapseButton.tsx Co-authored-by: Emilien Chauvet <emilien.chauvet.enpc@gmail.com> * Update isVisible * Update requested proposals for naming --------- Co-authored-by: Emilien Chauvet <emilien.chauvet.enpc@gmail.com>
This commit is contained in:
committed by
GitHub
parent
5a5ee1ff8d
commit
69e0917338
@@ -14,10 +14,8 @@ const StyledContainer = styled.div`
|
||||
display: flex;
|
||||
height: 34px;
|
||||
justify-content: space-between;
|
||||
margin-left: ${({ theme }) => theme.spacing(1)};
|
||||
padding: ${({ theme }) => theme.spacing(2)};
|
||||
padding-right: ${({ theme }) => theme.spacing(1)};
|
||||
padding-top: ${({ theme }) => theme.spacing(1)};
|
||||
padding: ${({ theme }) => theme.spacing(1)};
|
||||
padding-bottom: ${({ theme }) => theme.spacing(2)};
|
||||
user-select: none;
|
||||
`;
|
||||
|
||||
@@ -47,7 +45,11 @@ const StyledName = styled.div`
|
||||
margin-left: ${({ theme }) => theme.spacing(2)};
|
||||
`;
|
||||
|
||||
function NavWorkspaceButton() {
|
||||
type OwnProps = {
|
||||
hideCollapseButton: boolean;
|
||||
};
|
||||
|
||||
function NavWorkspaceButton({ hideCollapseButton }: OwnProps) {
|
||||
const currentUser = useRecoilValue(currentUserState);
|
||||
|
||||
const currentWorkspace = currentUser?.workspaceMember?.workspace;
|
||||
@@ -66,7 +68,7 @@ function NavWorkspaceButton() {
|
||||
></StyledLogo>
|
||||
<StyledName>{currentWorkspace?.displayName ?? 'Twenty'}</StyledName>
|
||||
</StyledLogoAndNameContainer>
|
||||
<NavCollapseButton direction="left" />
|
||||
<NavCollapseButton direction="left" hide={hideCollapseButton} />
|
||||
</StyledContainer>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user