Skip to content

Commit

Permalink
Revert "[GridList] Rename to ImageList & add deprecation warnings (#2…
Browse files Browse the repository at this point in the history
…2363)"

This reverts commit a2c1b56.
  • Loading branch information
oliviertassinari committed Nov 24, 2020
1 parent a194311 commit 688e248
Show file tree
Hide file tree
Showing 81 changed files with 629 additions and 1,625 deletions.
7 changes: 4 additions & 3 deletions docs/pages/api-docs/grid-list-tile-bar.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ import { GridListTileBar } from '@material-ui/core';

You can learn more about the difference by [reading this guide](/guides/minimizing-bundle-size/).

⚠️ The GridListTileBar component was renamed to ImageListTileBar to align with the current Material Design naming.

You should use `import { ImageListTileBar } from '@material-ui/core'`
or `import ImageListTileBar from '@material-ui/core/ImageListTileBar'`.

## Component name

Expand Down Expand Up @@ -66,3 +63,7 @@ You can override the style of the component thanks to one of these customization

If that's not sufficient, you can check the [implementation of the component](https://github.com/mui-org/material-ui/blob/master/packages/material-ui/src/GridListTileBar/GridListTileBar.js) for more detail.

## Demos

- [Grid List](/components/grid-list/)

7 changes: 4 additions & 3 deletions docs/pages/api-docs/grid-list-tile.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ import { GridListTile } from '@material-ui/core';

You can learn more about the difference by [reading this guide](/guides/minimizing-bundle-size/).

⚠️ The GridList component was renamed to ImageList to align with the current Material Design naming.

You should use `import { ImageListTile } from '@material-ui/core'`
or `import ImageListTile from '@material-ui/core/ImageListTile'`.

## Component name

Expand Down Expand Up @@ -58,3 +55,7 @@ You can override the style of the component thanks to one of these customization

If that's not sufficient, you can check the [implementation of the component](https://github.com/mui-org/material-ui/blob/master/packages/material-ui/src/GridListTile/GridListTile.js) for more detail.

## Demos

- [Grid List](/components/grid-list/)

7 changes: 4 additions & 3 deletions docs/pages/api-docs/grid-list.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ import { GridList } from '@material-ui/core';

You can learn more about the difference by [reading this guide](/guides/minimizing-bundle-size/).

⚠️ The GridList component was renamed to ImageList to align with the current Material Design naming.

You should use `import { ImageList } from '@material-ui/core'`
or `import ImageList from '@material-ui/core/ImageList'`.

## Component name

Expand Down Expand Up @@ -56,3 +53,7 @@ You can override the style of the component thanks to one of these customization

If that's not sufficient, you can check the [implementation of the component](https://github.com/mui-org/material-ui/blob/master/packages/material-ui/src/GridList/GridList.js) for more detail.

## Demos

- [Grid List](/components/grid-list/)

1 change: 1 addition & 0 deletions docs/pages/api-docs/icon-button.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,5 @@ You can take advantage of this behavior to [target nested components](/guides/ap
## Demos

- [Buttons](/components/buttons/)
- [Grid List](/components/grid-list/)

15 changes: 0 additions & 15 deletions docs/pages/api-docs/image-list-item-bar.js

This file was deleted.

70 changes: 0 additions & 70 deletions docs/pages/api-docs/image-list-item-bar.md

This file was deleted.

15 changes: 0 additions & 15 deletions docs/pages/api-docs/image-list-item.js

This file was deleted.

61 changes: 0 additions & 61 deletions docs/pages/api-docs/image-list-item.md

This file was deleted.

15 changes: 0 additions & 15 deletions docs/pages/api-docs/image-list.js

This file was deleted.

61 changes: 0 additions & 61 deletions docs/pages/api-docs/image-list.md

This file was deleted.

1 change: 1 addition & 0 deletions docs/pages/api-docs/list-subheader.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,6 @@ If that's not sufficient, you can check the [implementation of the component](ht

## Demos

- [Grid List](/components/grid-list/)
- [Lists](/components/lists/)

Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import React from 'react';
import MarkdownDocs from 'docs/src/modules/components/MarkdownDocs';
import { prepareMarkdown } from 'docs/src/modules/utils/parseMarkdown';

const pageFilename = 'components/image-list';
const requireDemo = require.context('docs/src/pages/components/image-list', false, /\.(js|tsx)$/);
const pageFilename = 'components/grid-list';
const requireDemo = require.context('docs/src/pages/components/grid-list', false, /\.(js|tsx)$/);
const requireRaw = require.context(
'!raw-loader!../../src/pages/components/image-list',
'!raw-loader!../../src/pages/components/grid-list',
false,
/\.(js|md|tsx)$/,
);
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ const pages = [
{ pathname: '/components/box' },
{ pathname: '/components/container' },
{ pathname: '/components/grid' },
{ pathname: '/components/grid-list' },
{ pathname: '/components/hidden' },
{ pathname: '/components/image-list' },
],
},
{
Expand Down
6 changes: 3 additions & 3 deletions docs/src/pages/components/buttons/ButtonBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import Typography from '@material-ui/core/Typography';

const images = [
{
url: '/static/images/image-list/breakfast.jpg',
url: '/static/images/grid-list/breakfast.jpg',
title: 'Breakfast',
width: '40%',
},
{
url: '/static/images/image-list/burgers.jpg',
url: '/static/images/grid-list/burgers.jpg',
title: 'Burgers',
width: '30%',
},
{
url: '/static/images/image-list/camera.jpg',
url: '/static/images/grid-list/camera.jpg',
title: 'Camera',
width: '30%',
},
Expand Down
6 changes: 3 additions & 3 deletions docs/src/pages/components/buttons/ButtonBase.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import Typography from '@material-ui/core/Typography';

const images = [
{
url: '/static/images/image-list/breakfast.jpg',
url: '/static/images/grid-list/breakfast.jpg',
title: 'Breakfast',
width: '40%',
},
{
url: '/static/images/image-list/burgers.jpg',
url: '/static/images/grid-list/burgers.jpg',
title: 'Burgers',
width: '30%',
},
{
url: '/static/images/image-list/camera.jpg',
url: '/static/images/grid-list/camera.jpg',
title: 'Camera',
width: '30%',
},
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components/cards/cards.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Set `variant="outlined"` to render an outlined card.

## Complex Interaction

On desktop, card content can expand. (Click the downward chevron to view the recipe.)
On desktop, card content can expand.

{{"demo": "pages/components/cards/RecipeReviewCard.js", "bg": true}}

Expand Down
Loading

0 comments on commit 688e248

Please sign in to comment.