Skip to content

Commit

Permalink
Merge pull request #145 from johnchoi96/feature/osu-tooltip
Browse files Browse the repository at this point in the history
Added osu and gatech tooltips
  • Loading branch information
johnchoi96 authored Dec 21, 2023
2 parents bfc3e50 + f55218e commit fe03869
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 20 deletions.
51 changes: 31 additions & 20 deletions src/components/aboutpage/EducationTimeline.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import 'react-vertical-timeline-component/style.min.css'
import { ThemeContext } from '../../App'

import { fontColorForBackground } from '../../Utils/colorUtils'
import { Tooltip } from '@mui/material'
import { gatechDescription, osuDescription } from './education_description'

function GeorgiaTech({ isDarkMode }) {
const techGold = '#b3a369'
Expand Down Expand Up @@ -40,14 +42,19 @@ function GeorgiaTech({ isDarkMode }) {
}
position='right'
>
<h3 className='vertical-timeline-element-title fw-bold'>
Georgia Institute of Technology
</h3>
<h5 className='vertical-timeline-element-subtitle'>
College of Computing
</h5>
<h6 className='vertical-timeline-element-subtitle'>Atlanta, GA</h6>
<p>Master of Science - MS, Computer Science</p>
<Tooltip title={gatechDescription}>
<div>
<h3 className='vertical-timeline-element-title fw-bold'>
Georgia Institute of Technology
</h3>
<h5 className='vertical-timeline-element-subtitle'>
College of Computing
</h5>
<h6 className='vertical-timeline-element-subtitle'>Atlanta, GA</h6>
<p>Master of Science - MS, Computer Science</p>
</div>
</Tooltip>

</VerticalTimelineElement>
)
}
Expand Down Expand Up @@ -83,18 +90,22 @@ function TheOhioStateUniversity({ isDarkMode }) {
}
position='right'
>
<h3 className='vertical-timeline-element-title fw-bold'>
The Ohio State University
</h3>
<h5 className='vertical-timeline-element-subtitle'>
College of Engineering
</h5>
<h6 className='vertical-timeline-element-subtitle'>Columbus, OH</h6>
<p>
Bachelor of Science - BS, Computer Science and Engineering
<br />
Software Engineering Specialization
</p>
<Tooltip title={osuDescription}>
<div>
<h3 className='vertical-timeline-element-title fw-bold'>
The Ohio State University
</h3>
<h5 className='vertical-timeline-element-subtitle'>
College of Engineering
</h5>
<h6 className='vertical-timeline-element-subtitle'>Columbus, OH</h6>
<p>
Bachelor of Science - BS, Computer Science and Engineering
<br />
Software Engineering Specialization
</p>
</div>
</Tooltip>
</VerticalTimelineElement>
)
}
Expand Down
7 changes: 7 additions & 0 deletions src/components/aboutpage/education_description.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

export const osuDescription = `Software engineering specialization is the
area most people think of when they hear the phrase “computer science.” It encompasses
programming languages, software development (including coding practices), analysis,
testing and debugging, optimization, and scalability among many areas. Source: https://cse.osu.edu`

export const gatechDescription = `OMSCS Starting 2024. Specialization TBD.`

0 comments on commit fe03869

Please sign in to comment.