Skip to content

Commit fc20a6b

Browse files
authored
Merge pull request #1450 from Northeastern-Electric-Racing/#1314-Version-Overlap
#1314 Version number overlaping sidebar
2 parents 5325992 + ef03f09 commit fc20a6b

2 files changed

Lines changed: 15 additions & 7 deletions

File tree

src/frontend/src/layouts/Sidebar/Sidebar.tsx

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,19 @@ const Sidebar: React.FC<SideBarProps> = ({ open, handleDrawerClose }) => {
7171
<IconButton onClick={handleDrawerClose}>{theme.direction === 'rtl' ? <ChevronRight /> : <ChevronLeft />}</IconButton>
7272
</DrawerHeader>
7373
<Divider />
74-
<Box overflow={'auto'} sx={{ overflowX: 'hidden' }}>
75-
{linkItems.map((linkItem) => (
76-
<NavPageLink {...linkItem} open={open} />
77-
))}
74+
<Box
75+
overflow={'auto'}
76+
sx={{ overflowX: 'hidden' }}
77+
display="flex"
78+
flexDirection={'column'}
79+
flex={1}
80+
justifyContent={'space-between'}
81+
>
82+
<Box>
83+
{linkItems.map((linkItem) => (
84+
<NavPageLink {...linkItem} open={open} />
85+
))}
86+
</Box>
7887
<Typography className={styles.versionNumber}>4.0.0</Typography>
7988
</Box>
8089
</NERDrawer>

src/frontend/src/stylesheets/layouts/sidebar/sidebar.module.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414
}
1515

1616
.versionNumber {
17-
position: absolute;
17+
position: relative;
1818
text-align: center;
1919
color: #ffffff;
2020
width: 100%;
21-
bottom: 0;
22-
height: 6em;
21+
padding-bottom: 2em;
2322
}

0 commit comments

Comments
 (0)