Skip to content
Merged
Changes from all commits
Commits
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
23 changes: 15 additions & 8 deletions src/components/timeline/MuiTimeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,22 @@ function MuiTimeline() {
<GlobalCss />
<TimelineItem>
<TimelineOppositeContent >
<Typography color="textSecondary">5<sup>th</sup> Feb</Typography>
<Typography color="textSecondary">6<sup>th</sup> Feb</Typography>
</TimelineOppositeContent>
<TimelineSeparator>
<TimelineDot />
<TimelineConnector />
</TimelineSeparator>
<TimelineContent>
<Typography variant="h6" component="h1">
Bootcamp
Bootcamp & Ideathon
</Typography>
<Typography>
Get acquainted with the event and its requirements.
</Typography>
<Typography>
An ideathon is a short, intensive, workshop-like experience for students to address some of the most pressing challenges of our time.
Comment on lines +55 to +58
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Run this content by Shaket in the morning, and it'll be cool for a merge.

</Typography>
<Typography>Quickly get acquainted with the event and its requirements.</Typography>
</TimelineContent>
</TimelineItem>
<TimelineItem>
Expand All @@ -64,9 +69,11 @@ function MuiTimeline() {
</TimelineSeparator>
<TimelineContent>
<Typography variant="h6" component="h1">
Hackathon
Review
</Typography>
<Typography>
Submitted projects will be evaluated by an expert panel based on several parameters.
</Typography>
<Typography>Start hacking! Now is the time to come up with cool and exotic ideas, something that will one day make you glorious. </Typography>
</TimelineContent>
</TimelineItem>
<TimelineItem>
Expand All @@ -79,14 +86,14 @@ function MuiTimeline() {
</TimelineSeparator>
<TimelineContent>
<Typography variant="h6" component="h1">
Review
Hackathon
</Typography>
<Typography>Submitted projects will be evaluated by an expert panel based on several parameters.</Typography>
<Typography>Start hacking! Now is the time to come up with cool and exotic ideas, something that will one day make you glorious. </Typography>
</TimelineContent>
</TimelineItem>
<TimelineItem>
<TimelineOppositeContent >
<Typography color="textSecondary">13<sup>th</sup> Feb</Typography>
<Typography color="textSecondary">14<sup>th</sup> Feb</Typography>
</TimelineOppositeContent>
<TimelineSeparator>
<TimelineDot />
Expand Down