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

[docs] Fix Dashboard sidenav sroll #44876

Merged
merged 1 commit into from
Jan 13, 2025
Merged

[docs] Fix Dashboard sidenav sroll #44876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 docs/data/material/getting-started/templates/dashboard/components/CardAlert.js
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion docs/data/material/getting-started/templates/dashboard/components/CardAlert.tsx
View file
Open in desktop
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
1 change: 0 additions & 1 deletion docs/data/material/getting-started/templates/dashboard/components/CustomizedDataGrid.js
View file
Open in desktop
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
1 change: 0 additions & 1 deletion docs/data/material/getting-started/templates/dashboard/components/CustomizedDataGrid.tsx
View file
Open in desktop
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
1 change: 0 additions & 1 deletion docs/data/material/getting-started/templates/dashboard/components/MenuContent.js
View file
Open in desktop
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
1 change: 0 additions & 1 deletion docs/data/material/getting-started/templates/dashboard/components/MenuContent.tsx
View file
Open in desktop
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
13 changes: 11 additions & 2 deletions docs/data/material/getting-started/templates/dashboard/components/SideMenu.js
View file
Open in desktop
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
13 changes: 11 additions & 2 deletions docs/data/material/getting-started/templates/dashboard/components/SideMenu.tsx
View file
Open in desktop
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
1 change: 0 additions & 1 deletion docs/data/material/getting-started/templates/dashboard/components/SideMenuMobile.js
View file
Open in desktop
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
1 change: 0 additions & 1 deletion docs/data/material/getting-started/templates/dashboard/components/SideMenuMobile.tsx
View file
Open in desktop
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
Loading