Skip to content

Commit

Permalink
[docs] Fix Dashboard sidenav sroll (#44876)
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari authored Jan 13, 2025
1 parent 61c6d1a commit dd69cf0
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import AutoAwesomeRoundedIcon from '@mui/icons-material/AutoAwesomeRounded';

export default function CardAlert() {
return (
<Card variant="outlined" sx={{ m: 1.5, p: 1.5 }}>
<Card variant="outlined" sx={{ m: 1.5, flexShrink: 0 }}>
<CardContent>
<AutoAwesomeRoundedIcon fontSize="small" />
<Typography gutterBottom sx={{ fontWeight: 600 }}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import AutoAwesomeRoundedIcon from '@mui/icons-material/AutoAwesomeRounded';

export default function CardAlert() {
return (
<Card variant="outlined" sx={{ m: 1.5, p: 1.5 }}>
<Card variant="outlined" sx={{ m: 1.5, flexShrink: 0 }}>
<CardContent>
<AutoAwesomeRoundedIcon fontSize="small" />
<Typography gutterBottom sx={{ fontWeight: 600 }}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { columns, rows } from '../internals/data/gridData';
export default function CustomizedDataGrid() {
return (
<DataGrid
autoHeight
checkboxSelection
rows={rows}
columns={columns}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { columns, rows } from '../internals/data/gridData';
export default function CustomizedDataGrid() {
return (
<DataGrid
autoHeight
checkboxSelection
rows={rows}
columns={columns}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ export default function MenuContent() {
</ListItem>
))}
</List>

<List dense>
{secondaryListItems.map((item, index) => (
<ListItem key={index} disablePadding sx={{ display: 'block' }}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ export default function MenuContent() {
</ListItem>
))}
</List>

<List dense>
{secondaryListItems.map((item, index) => (
<ListItem key={index} disablePadding sx={{ display: 'block' }}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,17 @@ export default function SideMenu() {
<SelectContent />
</Box>
<Divider />
<MenuContent />
<CardAlert />
<Box
sx={{
overflow: 'auto',
height: '100%',
display: 'flex',
flexDirection: 'column',
}}
>
<MenuContent />
<CardAlert />
</Box>
<Stack
direction="row"
sx={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,17 @@ export default function SideMenu() {
<SelectContent />
</Box>
<Divider />
<MenuContent />
<CardAlert />
<Box
sx={{
overflow: 'auto',
height: '100%',
display: 'flex',
flexDirection: 'column',
}}
>
<MenuContent />
<CardAlert />
</Box>
<Stack
direction="row"
sx={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import Stack from '@mui/material/Stack';
import Typography from '@mui/material/Typography';
import LogoutRoundedIcon from '@mui/icons-material/LogoutRounded';
import NotificationsRoundedIcon from '@mui/icons-material/NotificationsRounded';

import MenuButton from './MenuButton';
import MenuContent from './MenuContent';
import CardAlert from './CardAlert';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import Stack from '@mui/material/Stack';
import Typography from '@mui/material/Typography';
import LogoutRoundedIcon from '@mui/icons-material/LogoutRounded';
import NotificationsRoundedIcon from '@mui/icons-material/NotificationsRounded';

import MenuButton from './MenuButton';
import MenuContent from './MenuContent';
import CardAlert from './CardAlert';
Expand Down

0 comments on commit dd69cf0

Please sign in to comment.