From c5e67f8bba9c16b9084ff2008d83e8bc07ba2453 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sat, 11 Jan 2020 12:51:49 +0100 Subject: [PATCH 1/2] [Alert] Follow import convention --- docs/pages/api/alert.md | 2 +- docs/pages/blog/december-2019-update.md | 2 +- docs/src/pages/components/alert/ActionAlerts.js | 2 +- docs/src/pages/components/alert/ActionAlerts.tsx | 2 +- docs/src/pages/components/alert/ColorAlerts.js | 2 +- docs/src/pages/components/alert/ColorAlerts.tsx | 2 +- docs/src/pages/components/alert/FilledAlerts.js | 2 +- docs/src/pages/components/alert/FilledAlerts.tsx | 2 +- docs/src/pages/components/alert/OutlinedAlerts.js | 2 +- docs/src/pages/components/alert/OutlinedAlerts.tsx | 2 +- docs/src/pages/components/alert/SimpleAlerts.js | 2 +- docs/src/pages/components/alert/SimpleAlerts.tsx | 2 +- docs/src/pages/components/alert/TransitionAlerts.js | 2 +- docs/src/pages/components/alert/TransitionAlerts.tsx | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pages/api/alert.md b/docs/pages/api/alert.md index 9e75271b5427ae..d99b8f5edda423 100644 --- a/docs/pages/api/alert.md +++ b/docs/pages/api/alert.md @@ -13,7 +13,7 @@ filename: /packages/material-ui-lab/src/Alert/Alert.js ```js import Alert from '@material-ui/lab/Alert'; // or -import { Alert } from '@material-ui/lab'; +import Alert from '@material-ui/lab/Alert'; ``` You can learn more about the difference by [reading this guide](/guides/minimizing-bundle-size/). diff --git a/docs/pages/blog/december-2019-update.md b/docs/pages/blog/december-2019-update.md index 6f44cdf8a9375c..75d8bf39715eda 100644 --- a/docs/pages/blog/december-2019-update.md +++ b/docs/pages/blog/december-2019-update.md @@ -10,7 +10,7 @@ description: Here are the most significant improvements in December. Here are the most significant improvements in December: -- 🚨 We have introduce a new [Alert](https://material-ui.com/components/alert/) component in the lab, thanks to **[@dimitropoulos](https://github.com/dimitropoulos)** ([#18702](https://github.com/mui-org/material-ui/pull/18702)). The component also supports composition with a [Snackbar](/components/snackbars/#customized-snackbars). +- 🚨 We have introduced a new [Alert](https://material-ui.com/components/alert/) component in the lab, thanks to **[@dimitropoulos](https://github.com/dimitropoulos)** ([#18702](https://github.com/mui-org/material-ui/pull/18702)). The component also supports composition with a [Snackbar](/components/snackbars/#customized-snackbars). ![Alert](/static/blog/december-2019-update/alert.png) diff --git a/docs/src/pages/components/alert/ActionAlerts.js b/docs/src/pages/components/alert/ActionAlerts.js index 71a615d6ba0fb7..c4bffa039d3d41 100644 --- a/docs/src/pages/components/alert/ActionAlerts.js +++ b/docs/src/pages/components/alert/ActionAlerts.js @@ -1,6 +1,6 @@ import React from 'react'; import { makeStyles } from '@material-ui/core/styles'; -import { Alert } from '@material-ui/lab'; +import Alert from '@material-ui/lab/Alert'; import Button from '@material-ui/core/Button'; const useStyles = makeStyles(theme => ({ diff --git a/docs/src/pages/components/alert/ActionAlerts.tsx b/docs/src/pages/components/alert/ActionAlerts.tsx index dcb953f72da608..88b32b4df9c215 100644 --- a/docs/src/pages/components/alert/ActionAlerts.tsx +++ b/docs/src/pages/components/alert/ActionAlerts.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'; -import { Alert } from '@material-ui/lab'; +import Alert from '@material-ui/lab/Alert'; import Button from '@material-ui/core/Button'; const useStyles = makeStyles((theme: Theme) => diff --git a/docs/src/pages/components/alert/ColorAlerts.js b/docs/src/pages/components/alert/ColorAlerts.js index 95a029e070f1e5..f90d05ce50d51d 100644 --- a/docs/src/pages/components/alert/ColorAlerts.js +++ b/docs/src/pages/components/alert/ColorAlerts.js @@ -1,6 +1,6 @@ import React from 'react'; import { makeStyles } from '@material-ui/core/styles'; -import { Alert } from '@material-ui/lab'; +import Alert from '@material-ui/lab/Alert'; const useStyles = makeStyles(theme => ({ root: { diff --git a/docs/src/pages/components/alert/ColorAlerts.tsx b/docs/src/pages/components/alert/ColorAlerts.tsx index 88b418d7a4273f..de67a4e1f936b4 100644 --- a/docs/src/pages/components/alert/ColorAlerts.tsx +++ b/docs/src/pages/components/alert/ColorAlerts.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'; -import { Alert } from '@material-ui/lab'; +import Alert from '@material-ui/lab/Alert'; const useStyles = makeStyles((theme: Theme) => createStyles({ diff --git a/docs/src/pages/components/alert/FilledAlerts.js b/docs/src/pages/components/alert/FilledAlerts.js index a6d41c46cea7d6..9f9b5a357c686c 100644 --- a/docs/src/pages/components/alert/FilledAlerts.js +++ b/docs/src/pages/components/alert/FilledAlerts.js @@ -1,6 +1,6 @@ import React from 'react'; import { makeStyles } from '@material-ui/core/styles'; -import { Alert } from '@material-ui/lab'; +import Alert from '@material-ui/lab/Alert'; const useStyles = makeStyles(theme => ({ root: { diff --git a/docs/src/pages/components/alert/FilledAlerts.tsx b/docs/src/pages/components/alert/FilledAlerts.tsx index c0e9acbe5ce3eb..bb34596adf63d5 100644 --- a/docs/src/pages/components/alert/FilledAlerts.tsx +++ b/docs/src/pages/components/alert/FilledAlerts.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'; -import { Alert } from '@material-ui/lab'; +import Alert from '@material-ui/lab/Alert'; const useStyles = makeStyles((theme: Theme) => createStyles({ diff --git a/docs/src/pages/components/alert/OutlinedAlerts.js b/docs/src/pages/components/alert/OutlinedAlerts.js index 17f40679bc19d9..54dc9651b88c8f 100644 --- a/docs/src/pages/components/alert/OutlinedAlerts.js +++ b/docs/src/pages/components/alert/OutlinedAlerts.js @@ -1,6 +1,6 @@ import React from 'react'; import { makeStyles } from '@material-ui/core/styles'; -import { Alert } from '@material-ui/lab'; +import Alert from '@material-ui/lab/Alert'; const useStyles = makeStyles(theme => ({ root: { diff --git a/docs/src/pages/components/alert/OutlinedAlerts.tsx b/docs/src/pages/components/alert/OutlinedAlerts.tsx index 88e89e05dee943..b9cbc44fd82ec9 100644 --- a/docs/src/pages/components/alert/OutlinedAlerts.tsx +++ b/docs/src/pages/components/alert/OutlinedAlerts.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'; -import { Alert } from '@material-ui/lab'; +import Alert from '@material-ui/lab/Alert'; const useStyles = makeStyles((theme: Theme) => createStyles({ diff --git a/docs/src/pages/components/alert/SimpleAlerts.js b/docs/src/pages/components/alert/SimpleAlerts.js index 78cb2424668517..5b0fc608d6fcc4 100644 --- a/docs/src/pages/components/alert/SimpleAlerts.js +++ b/docs/src/pages/components/alert/SimpleAlerts.js @@ -1,6 +1,6 @@ import React from 'react'; import { makeStyles } from '@material-ui/core/styles'; -import { Alert } from '@material-ui/lab'; +import Alert from '@material-ui/lab/Alert'; const useStyles = makeStyles(theme => ({ root: { diff --git a/docs/src/pages/components/alert/SimpleAlerts.tsx b/docs/src/pages/components/alert/SimpleAlerts.tsx index 88a6c45579a5c4..cf186d3d848969 100644 --- a/docs/src/pages/components/alert/SimpleAlerts.tsx +++ b/docs/src/pages/components/alert/SimpleAlerts.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'; -import { Alert } from '@material-ui/lab'; +import Alert from '@material-ui/lab/Alert'; const useStyles = makeStyles((theme: Theme) => createStyles({ diff --git a/docs/src/pages/components/alert/TransitionAlerts.js b/docs/src/pages/components/alert/TransitionAlerts.js index ce6322836bd7ba..adf5397b3160c4 100644 --- a/docs/src/pages/components/alert/TransitionAlerts.js +++ b/docs/src/pages/components/alert/TransitionAlerts.js @@ -1,6 +1,6 @@ import React from 'react'; import { makeStyles } from '@material-ui/core/styles'; -import { Alert } from '@material-ui/lab'; +import Alert from '@material-ui/lab/Alert'; import IconButton from '@material-ui/core/IconButton'; import Collapse from '@material-ui/core/Collapse'; import Button from '@material-ui/core/Button'; diff --git a/docs/src/pages/components/alert/TransitionAlerts.tsx b/docs/src/pages/components/alert/TransitionAlerts.tsx index 2ebb5c536ebe9c..abd622dc9354ad 100644 --- a/docs/src/pages/components/alert/TransitionAlerts.tsx +++ b/docs/src/pages/components/alert/TransitionAlerts.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'; -import { Alert } from '@material-ui/lab'; +import Alert from '@material-ui/lab/Alert'; import IconButton from '@material-ui/core/IconButton'; import Collapse from '@material-ui/core/Collapse'; import Button from '@material-ui/core/Button'; From 651bb7ba1ab8d68b16a281d8c7446929d9c08ae8 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sat, 11 Jan 2020 12:52:06 +0100 Subject: [PATCH 2/2] [docs] Fix table display --- docs/src/modules/components/MarkdownElement.js | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/modules/components/MarkdownElement.js b/docs/src/modules/components/MarkdownElement.js index 4e1d98a8a959b8..e7fd3f1fb98f82 100644 --- a/docs/src/modules/components/MarkdownElement.js +++ b/docs/src/modules/components/MarkdownElement.js @@ -216,6 +216,7 @@ const styles = theme => ({ '& table': { // Trade display table for scroll overflow display: 'block', + wordBreak: 'normal', width: '100%', overflowX: 'auto', WebkitOverflowScrolling: 'touch', // iOS momentum scrolling.