diff --git a/src/assets/css/App.css b/src/assets/css/App.css index 1d9d8bc..02ad704 100644 --- a/src/assets/css/App.css +++ b/src/assets/css/App.css @@ -66,6 +66,10 @@ h3, h4 { color: #a8a8a8; } +strong { + color: #ecebeb; +} + p, li { color: rgb(212, 212, 212); font-size: 1rem; @@ -240,6 +244,10 @@ a { justify-content: space-between; } +.start { + justify-content: left; +} + .onRight { position: absolute; right: 0; @@ -430,6 +438,8 @@ a { height: 22rem; border: .3rem rgba(156, 49, 45, .8) solid; background-color: rgba(22, 22, 22, .8); + transition: .3s; + overflow: hidden; } .projTitle > * { @@ -706,6 +716,13 @@ a { color: #db7e3b; } +.timeitem { + transition: .4s; + overflow-y: clip; + height: auto; + max-height: 100px; +} + .timeline-item{ border-left: solid #AAAAAA 3px; } diff --git a/src/assets/css/checkbox.css b/src/assets/css/checkbox.css index a473b18..d8583f7 100644 --- a/src/assets/css/checkbox.css +++ b/src/assets/css/checkbox.css @@ -2,27 +2,38 @@ display: none; } -/* checkbox by Matt Smith */ +.hiddenup { + max-height: 0px !important; +} + +.checkbox-wrapper > div { + margin-bottom: .5em; +} + +.checkbox-wrapper > div:last-child { + margin-bottom: 0;; +} + .checkbox-wrapper .switch { - display: inline-block; - height: 34px; + display: flex; position: relative; - width: 60px; + cursor: pointer; +} + +.checkbox-wrapper .switch > * { + align-self: center; } .checkbox-wrapper .switch input { display: none; } + .checkbox-wrapper .slider { background-color: #ccc; - bottom: 0; - cursor: pointer; - left: 0; - position: absolute; - right: 0; - top: 0; transition: 0.4s; + height: 34px; + width: 60px; } .checkbox-wrapper .slider:before { @@ -50,4 +61,8 @@ .checkbox-wrapper .slider.round:before { border-radius: 50%; -} \ No newline at end of file +} + +.checkbox-wrapper strong { + margin-left: .5em; +} diff --git a/src/componets/TimeItem.js b/src/componets/TimeItem.js index 7a5985e..6b4e959 100644 --- a/src/componets/TimeItem.js +++ b/src/componets/TimeItem.js @@ -4,6 +4,7 @@ export default class TimeItem extends React.Component { constructor(props) { super(props); this.date = props.date; + this.classes = props.classes; this.item = ( <>

{props.title}

@@ -15,6 +16,6 @@ export default class TimeItem extends React.Component { } render() { - return <>

{this.date}

{this.item}
; + return

{this.date}

{this.item}
; } } diff --git a/src/componets/Timeline.js b/src/componets/Timeline.js index bfe8eff..9d19da5 100644 --- a/src/componets/Timeline.js +++ b/src/componets/Timeline.js @@ -4,12 +4,13 @@ export default class Timeline extends React.Component { constructor(props) { super(props); this.items = props.children; + this.classes = props.classes; } componentDidMount() {} render() { - return
+ return
{this.items}
; } diff --git a/src/pages/AboutMe.js b/src/pages/AboutMe.js index 67b978f..0550167 100644 --- a/src/pages/AboutMe.js +++ b/src/pages/AboutMe.js @@ -5,6 +5,7 @@ import ChessBed from "../componets/ChessBed.js"; import Skills from "../componets/Skills"; import Timeline from '../componets/Timeline'; import TimeItem from "../componets/TimeItem.js"; +import { toggle } from "../scripts/checkbox"; // import img1 from '../assets/photos/itsa_me.JPG' // import img2 from '../assets/photos/me_robot.jpeg' // import img3 from "../assets/photos/AcademicTeam.jpg"; @@ -134,9 +135,32 @@ export default function AboutMe() {
*/}
- - Bottomtext - +
+
+ +
+
+ +
+
+ +
+
+ + Bottomtext +
diff --git a/src/pages/Projects.js b/src/pages/Projects.js index 1897832..f420d7f 100644 --- a/src/pages/Projects.js +++ b/src/pages/Projects.js @@ -15,7 +15,7 @@ import vexbutt from "../assets/photos/vexcodeButtons.jpeg"; export default function Projects() { return ( -
+
toggle('')}>

Projects

@@ -29,28 +29,34 @@ export default function Projects() {

+
- Pinned +
+
- Programming -
+
+ - Geospacial +
- Collects RIT Gym Occupancy data for analysis, determining busiest + Collects RIT Gym Occupancy data, determining busiest workout times. - + A tampermonkey tool used to automatically answer and submit online trivia forms, which can be tailored to different site layouts.
@@ -176,6 +186,7 @@ export default function Projects() { div"); for (let i = 0; i < list.length; i++) { - list[i].classList.add("hidden"); + list[i].classList.add("hidden" + dir); for (let x = 0; x < list[i].classList.length; x++) { if (allow.includes(list[i].classList[x])) { - list[i].classList.remove("hidden"); + list[i].classList.remove("hidden" + dir); break; } }