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

adjust nav bar spacing #143

Merged
merged 2 commits into from
Dec 14, 2022
Merged

adjust nav bar spacing #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a032664
adjust nav bar spacing
shanghaikid Dec 14, 2022
533f95a
fix community button
shanghaikid Dec 14, 2022
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 client/src/components/menu/CommunityBtn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const getStyles = makeStyles((theme: Theme) => ({
root: {
bottom: theme.spacing(2),
position: 'absolute',
right: theme.spacing(3),
right: theme.spacing(1),
width: theme.spacing(5),
zIndex: 3,
},
Expand Down
18 changes: 9 additions & 9 deletions client/src/components/menu/NavMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const useStyles = makeStyles((theme: Theme) =>
}),
},
rootCollapse: {
width: '86px',
width: theme.spacing(9),
},
rootExpand: {
width: (props: any) => props.width || '100%',
Expand All @@ -41,7 +41,7 @@ const useStyles = makeStyles((theme: Theme) =>
},
item: {
marginBottom: theme.spacing(2),
paddingLeft: theme.spacing(4),
paddingLeft: theme.spacing(3),
boxSizing: 'content-box',
height: theme.spacing(3),
width: 'initial',
Expand Down Expand Up @@ -77,17 +77,16 @@ const useStyles = makeStyles((theme: Theme) =>
display: 'flex',
alignItems: 'center',
height: '86px',
marginBottom: theme.spacing(8),
marginBottom: theme.spacing(7),
backgroundColor: theme.palette.primary.main,
paddingLeft: theme.spacing(4),
paddingLeft: theme.spacing(3),

'& .title': {
margin: 0,
fontSize: '16px',
paddingLeft: theme.spacing(2),
fontSize: '24px',
letterSpacing: '0.15px',
color: 'white',
whiteSpace: 'nowrap',
lineHeight: '86px',
},
},
logo: {
Expand All @@ -100,6 +99,7 @@ const useStyles = makeStyles((theme: Theme) =>
'& path': {
fill: 'white',
},
transform: 'scale(2)',
},
logoCollapse: {
backgroundColor: theme.palette.primary.main,
Expand Down Expand Up @@ -136,11 +136,11 @@ const useStyles = makeStyles((theme: Theme) =>
transform: 'rotateZ(180deg)',
},
collapseIcon: {
left: '73px',
left: theme.spacing(7.5),
},
version: {
position: 'absolute',
left: '22px',
left: theme.spacing(2.5),
bottom: (props: any) => (props.expanded ? '20px' : '70px'),
},
})
Expand Down