diff --git a/src/assets/css/App.css b/src/assets/css/App.css index 3a1199d..1d9d8bc 100644 --- a/src/assets/css/App.css +++ b/src/assets/css/App.css @@ -20,6 +20,11 @@ src: url("../fonts/SunsetClub.otf") } +@font-face { + font-family: "robotoreg"; + src: url("../fonts/RobotoCondensed-Regular.ttf") +} + html, body { overflow-x: hidden; } @@ -596,7 +601,6 @@ a { .chess { width: 300px; - height: calc(125px + 2em); border: none; /* transform: scale(.8); float: right; */ @@ -702,6 +706,40 @@ a { color: #db7e3b; } +.timeline-item{ + border-left: solid #AAAAAA 3px; +} + +.timeline-item h2{ + margin-top: 0px; + margin-left: .5em; + font-family: robotoreg; +} + +.timeline-item p{ + margin-bottom: 0px; + padding-bottom: 2em; + padding-left: 3em; + font-family: robotoreg; +} + +/* .timeline-item::before{ + content: ""; + background-color: red; + border: solid black 3px; + border-radius: 100%; + padding: 5px; + position: absolute; + margin-left: -8px; +} */ + +.datetext { + margin: .25em; + font-size: small; + margin-left: -1.5em; + font-family: robotoreg; +} + @font-face { font-family: Chess New; src: url('https://www.chess.com/bundles/web/fonts/chessglyph-new.0cc8115c.woff2'); @@ -803,7 +841,7 @@ a { padding-bottom: .5rem; margin-right: auto; margin-left: auto; - width: 400px; + width: min(100vw, 400px); } .socials * { diff --git a/src/assets/fonts/RobotoCondensed-Regular.ttf b/src/assets/fonts/RobotoCondensed-Regular.ttf new file mode 100644 index 0000000..17e8ea5 Binary files /dev/null and b/src/assets/fonts/RobotoCondensed-Regular.ttf differ diff --git a/src/componets/TimeItem.js b/src/componets/TimeItem.js new file mode 100644 index 0000000..7a5985e --- /dev/null +++ b/src/componets/TimeItem.js @@ -0,0 +1,20 @@ +import React from "react"; + +export default class TimeItem extends React.Component { + constructor(props) { + super(props); + this.date = props.date; + this.item = ( + <> +

{props.title}

+
+

{props.children}

+
+ + ); + } + + render() { + return <>

{this.date}

{this.item}
; + } +} diff --git a/src/componets/Timeline.js b/src/componets/Timeline.js new file mode 100644 index 0000000..bfe8eff --- /dev/null +++ b/src/componets/Timeline.js @@ -0,0 +1,16 @@ +import React from "react"; + +export default class Timeline extends React.Component { + constructor(props) { + super(props); + this.items = props.children; + } + + componentDidMount() {} + + render() { + return
+ {this.items} +
; + } +} diff --git a/src/pages/AboutMe.js b/src/pages/AboutMe.js index 9ad458f..67b978f 100644 --- a/src/pages/AboutMe.js +++ b/src/pages/AboutMe.js @@ -1,15 +1,17 @@ import React from "react"; -import MyCarousel from "../componets/Carousel.js"; +// import MyCarousel from "../componets/Carousel.js"; import ChessBed from "../componets/ChessBed.js"; // import HexGrid from "../componets/HexGrid"; import Skills from "../componets/Skills"; +import Timeline from '../componets/Timeline'; +import TimeItem from "../componets/TimeItem.js"; // import img1 from '../assets/photos/itsa_me.JPG' // import img2 from '../assets/photos/me_robot.jpeg' -import img3 from "../assets/photos/AcademicTeam.jpg"; -import img4 from "../assets/photos/hagerstownVex2019.jpg"; -import img5 from "../assets/photos/WeThePeople_Districts.jpg"; -import img6 from "../assets/photos/WeThePeople.jpg"; -import img7 from "../assets/photos/WeThePeople_NationalsSetup.jpg"; +// import img3 from "../assets/photos/AcademicTeam.jpg"; +// import img4 from "../assets/photos/hagerstownVex2019.jpg"; +// import img5 from "../assets/photos/WeThePeople_Districts.jpg"; +// import img6 from "../assets/photos/WeThePeople.jpg"; +// import img7 from "../assets/photos/WeThePeople_NationalsSetup.jpg"; export default function AboutMe() { return ( @@ -51,9 +53,6 @@ export default function AboutMe() {

*/} {/*Me*/} -
- -
@@ -99,8 +98,11 @@ export default function AboutMe() { "ArcGIS", ]} +
+ +
-
+ {/*

Extracirricular Awards

{[ @@ -129,7 +131,13 @@ export default function AboutMe() { }, ]} -
+
*/} +
+
+ + Bottomtext + +
);