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

[docs] Migrate Timeline demos to emotion #26036

Merged
merged 2 commits into from
Apr 29, 2021
Merged

[docs] Migrate Timeline demos to emotion #26036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b26321
Migrate CustomizedTimeline to emotion
vicasas Apr 29, 2021
7615374
Use shorhands
vicasas Apr 29, 2021
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
31 changes: 8 additions & 23 deletions docs/src/pages/components/timeline/CustomizedTimeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import Timeline from '@material-ui/lab/Timeline';
import TimelineItem from '@material-ui/lab/TimelineItem';
import TimelineSeparator from '@material-ui/lab/TimelineSeparator';
Expand All @@ -13,26 +12,12 @@ import HotelIcon from '@material-ui/icons/Hotel';
import RepeatIcon from '@material-ui/icons/Repeat';
import Typography from '@material-ui/core/Typography';

const useStyles = makeStyles((theme) => ({
timelineContent: {
padding: '12px 16px',
},
secondaryTail: {
backgroundColor: theme.palette.secondary.main,
},
verticallyCenterContent: {
margin: 'auto 0',
},
}));

export default function CustomizedTimeline() {
const classes = useStyles();

return (
<Timeline position="alternate">
<TimelineItem>
<TimelineOppositeContent
className={classes.verticallyCenterContent}
sx={{ m: 'auto 0' }}
align="right"
variant="body2"
color="text.secondary"
Expand All @@ -46,7 +31,7 @@ export default function CustomizedTimeline() {
</TimelineDot>
<TimelineConnector />
</TimelineSeparator>
<TimelineContent className={classes.timelineContent}>
<TimelineContent sx={{ py: '12px', px: 2 }}>
<Typography variant="h6" component="span">
Eat
</Typography>
Expand All @@ -55,7 +40,7 @@ export default function CustomizedTimeline() {
</TimelineItem>
<TimelineItem>
<TimelineOppositeContent
className={classes.verticallyCenterContent}
sx={{ m: 'auto 0' }}
variant="body2"
color="text.secondary"
>
Expand All @@ -68,7 +53,7 @@ export default function CustomizedTimeline() {
</TimelineDot>
<TimelineConnector />
</TimelineSeparator>
<TimelineContent className={classes.timelineContent}>
<TimelineContent sx={{ py: '12px', px: 2 }}>
<Typography variant="h6" component="span">
Code
</Typography>
Expand All @@ -81,9 +66,9 @@ export default function CustomizedTimeline() {
<TimelineDot color="primary" variant="outlined">
<HotelIcon />
</TimelineDot>
<TimelineConnector className={classes.secondaryTail} />
<TimelineConnector sx={{ bgcolor: 'secondary.main' }} />
</TimelineSeparator>
<TimelineContent className={classes.timelineContent}>
<TimelineContent sx={{ py: '12px', px: 2 }}>
<Typography variant="h6" component="span">
Sleep
</Typography>
Expand All @@ -92,13 +77,13 @@ export default function CustomizedTimeline() {
</TimelineItem>
<TimelineItem>
<TimelineSeparator>
<TimelineConnector className={classes.secondaryTail} />
<TimelineConnector sx={{ bgcolor: 'secondary.main' }} />
<TimelineDot color="secondary">
<RepeatIcon />
</TimelineDot>
<TimelineConnector />
</TimelineSeparator>
<TimelineContent className={classes.timelineContent}>
<TimelineContent sx={{ py: '12px', px: 2 }}>
<Typography variant="h6" component="span">
Repeat
</Typography>
Expand Down
31 changes: 8 additions & 23 deletions docs/src/pages/components/timeline/CustomizedTimeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import Timeline from '@material-ui/lab/Timeline';
import TimelineItem from '@material-ui/lab/TimelineItem';
import TimelineSeparator from '@material-ui/lab/TimelineSeparator';
Expand All @@ -13,26 +12,12 @@ import HotelIcon from '@material-ui/icons/Hotel';
import RepeatIcon from '@material-ui/icons/Repeat';
import Typography from '@material-ui/core/Typography';

const useStyles = makeStyles((theme) => ({
timelineContent: {
padding: '12px 16px',
},
secondaryTail: {
backgroundColor: theme.palette.secondary.main,
},
verticallyCenterContent: {
margin: 'auto 0',
},
}));

export default function CustomizedTimeline() {
const classes = useStyles();

return (
<Timeline position="alternate">
<TimelineItem>
<TimelineOppositeContent
className={classes.verticallyCenterContent}
sx={{ m: 'auto 0' }}
align="right"
variant="body2"
color="text.secondary"
Expand All @@ -46,7 +31,7 @@ export default function CustomizedTimeline() {
</TimelineDot>
<TimelineConnector />
</TimelineSeparator>
<TimelineContent className={classes.timelineContent}>
<TimelineContent sx={{ py: '12px', px: 2 }}>
<Typography variant="h6" component="span">
Eat
</Typography>
Expand All @@ -55,7 +40,7 @@ export default function CustomizedTimeline() {
</TimelineItem>
<TimelineItem>
<TimelineOppositeContent
className={classes.verticallyCenterContent}
sx={{ m: 'auto 0' }}
variant="body2"
color="text.secondary"
>
Expand All @@ -68,7 +53,7 @@ export default function CustomizedTimeline() {
</TimelineDot>
<TimelineConnector />
</TimelineSeparator>
<TimelineContent className={classes.timelineContent}>
<TimelineContent sx={{ py: '12px', px: 2 }}>
<Typography variant="h6" component="span">
Code
</Typography>
Expand All @@ -81,9 +66,9 @@ export default function CustomizedTimeline() {
<TimelineDot color="primary" variant="outlined">
<HotelIcon />
</TimelineDot>
<TimelineConnector className={classes.secondaryTail} />
<TimelineConnector sx={{ bgcolor: 'secondary.main' }} />
</TimelineSeparator>
<TimelineContent className={classes.timelineContent}>
<TimelineContent sx={{ py: '12px', px: 2 }}>
<Typography variant="h6" component="span">
Sleep
</Typography>
Expand All @@ -92,13 +77,13 @@ export default function CustomizedTimeline() {
</TimelineItem>
<TimelineItem>
<TimelineSeparator>
<TimelineConnector className={classes.secondaryTail} />
<TimelineConnector sx={{ bgcolor: 'secondary.main' }} />
<TimelineDot color="secondary">
<RepeatIcon />
</TimelineDot>
<TimelineConnector />
</TimelineSeparator>
<TimelineContent className={classes.timelineContent}>
<TimelineContent sx={{ py: '12px', px: 2 }}>
<Typography variant="h6" component="span">
Repeat
</Typography>
Expand Down