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

Jump to bottom

[Alert] Fix support for nested elements #20490

Merged
merged 1 commit into from
Apr 10, 2020
Merged

[Alert] Fix support for nested elements #20490

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
8 changes: 4 additions & 4 deletions docs/src/pages/components/alert/DescriptionAlerts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ export default function DescriptionAlerts() {
<div className={classes.root}>
<Alert severity="error">
<AlertTitle>Error</AlertTitle>
This is an error alert — check it out!
This is an error alert — <strong>check it out!</strong>
</Alert>
<Alert severity="warning">
<AlertTitle>Warning</AlertTitle>
This is a warning alert — check it out!
This is a warning alert — <strong>check it out!</strong>
</Alert>
<Alert severity="info">
<AlertTitle>Info</AlertTitle>
This is an info alert — check it out!
This is an info alert — <strong>check it out!</strong>
</Alert>
<Alert severity="success">
<AlertTitle>Success</AlertTitle>
This is a success alert — check it out!
This is a success alert — <strong>check it out!</strong>
</Alert>
</div>
);
Expand Down
8 changes: 4 additions & 4 deletions docs/src/pages/components/alert/DescriptionAlerts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ export default function DescriptionAlerts() {
<div className={classes.root}>
<Alert severity="error">
<AlertTitle>Error</AlertTitle>
This is an error alert — check it out!
This is an error alert — <strong>check it out!</strong>
</Alert>
<Alert severity="warning">
<AlertTitle>Warning</AlertTitle>
This is a warning alert — check it out!
This is a warning alert — <strong>check it out!</strong>
</Alert>
<Alert severity="info">
<AlertTitle>Info</AlertTitle>
This is an info alert — check it out!
This is an info alert — <strong>check it out!</strong>
</Alert>
<Alert severity="success">
<AlertTitle>Success</AlertTitle>
This is a success alert — check it out!
This is a success alert — <strong>check it out!</strong>
</Alert>
</div>
);
Expand Down
3 changes: 0 additions & 3 deletions packages/material-ui-lab/src/Alert/Alert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@ export const styles = (theme) => {
/* Styles applied to the message wrapper element. */
message: {
padding: '8px 0',
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
},
/* Styles applied to the action wrapper element if `action` is provided. */
action: {
Expand Down