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] Avoid confusion between layout grid and data grid #22681

Merged
merged 4 commits into from
Sep 22, 2020
Merged

[docs] Avoid confusion between layout grid and data grid #22681

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12c4760
[docs] Avoid confusion between layout grid and data grid
oliviertassinari Sep 21, 2020
1c31274
Update docs/src/pages/components/grid/grid.md
oliviertassinari Sep 21, 2020
ea128af
only demo
oliviertassinari Sep 21, 2020
08fcd30
Update docs/src/pages/components/grid/grid.md
oliviertassinari Sep 21, 2020
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
1 change: 1 addition & 0 deletions docs/public/_redirects
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,6 @@ https://v3-9-0.material-ui.com/* https://v3.material-ui.com/:splat 301!
## material-ui-x is configured to be hosted at the root.
/api/*/ https://material-ui-x.netlify.app/api/:splat/ 200
/components/* https://material-ui-x.netlify.app/components/:splat 200
/components/data-grid/full-screen-demo/ https://muix-preview.netlify.app/ 200
/_next/* https://material-ui-x.netlify.app/_next/:splat 200
/static/x/* https://material-ui-x.netlify.app/static/x/:splat 200
2 changes: 2 additions & 0 deletions docs/src/pages/components/grid/grid.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Material Design’s responsive UI is based on a 12-column grid layout.

{{"component": "modules/components/ComponentLinkHeader.js"}}

> ⚠️ The `Grid` component shouldn't be confused with a data grid. The component is closer to a layout grid. For a data grid head to [our `DataGrid` component](/components/data-grid/).

## How it works

The grid system is implemented with the `Grid` component:
Expand Down