diff --git a/home.css b/home.css index 36083e1..925347b 100644 --- a/home.css +++ b/home.css @@ -2,6 +2,7 @@ background-image: url("assets/home/background-01.svg"); background-size: cover; + background-color: #222; width: 100%; height: 100vh; color: white; diff --git a/mainStyle.css b/mainStyle.css index ecd7d0f..99b42ab 100644 --- a/mainStyle.css +++ b/mainStyle.css @@ -1,5 +1,5 @@ @import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,200;0,300;0,400;0,600;0,700;0,900;1,200;1,300;1,400;1,600;1,700;1,900&display=swap'); - +@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap'); body{ margin: 0; } @@ -7,7 +7,7 @@ body{ .mainContent { margin: 0; padding: 0; - font-family: "Source Sans Pro", sans-serif; + font-family: "Poppins", sans-serif; color: white; width: 100%; height: 100vh; diff --git a/navbar.css b/navbar.css index c308a75..30c9fc4 100644 --- a/navbar.css +++ b/navbar.css @@ -1,4 +1,3 @@ -@import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,200;0,300;0,400;0,600;0,700;0,900;1,200;1,300;1,400;1,600;1,700;1,900&display=swap'); nav { margin: 0; padding-left: 10px; @@ -27,7 +26,6 @@ nav { padding: 10px; font-size: 14px; font-weight: 400; - font-family: 'Source Sans Pro', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif; } .navbarButton a{ diff --git a/projects/car.bmp b/projects/carFrameRendered.bmp similarity index 100% rename from projects/car.bmp rename to projects/carFrameRendered.bmp diff --git a/projects/project_pages/carFrame.html b/projects/project_pages/carFrame.html new file mode 100644 index 0000000..6d55e8d --- /dev/null +++ b/projects/project_pages/carFrame.html @@ -0,0 +1,45 @@ + + + + + + + + + + + + Car Frame + + +
+ + + +
+

Mini Watch

+ +

Made in Autodesk Inventor with 3D sketches and frame generator.

+ + + + +
+ +
+ + + \ No newline at end of file diff --git a/projects/project_pages/differentialDriveRobot.html b/projects/project_pages/differentialDriveRobot.html new file mode 100644 index 0000000..73f6daa --- /dev/null +++ b/projects/project_pages/differentialDriveRobot.html @@ -0,0 +1,45 @@ + + + + + + + + + + + + Differential Drive Robot + + +
+ + + +
+

Differntial Drive Robot

+ +

This robot was initially designed for Robot Tour, a building event at Science Olympiad. The car is powered by 8 AA rechargable batteries. + In order to accurately travel in a straight line a PID algorithm is run on both wheels using the input of a rotary encoder on both drive motors.

+ + + +
+ +
+ + + \ No newline at end of file diff --git a/projects/project_pages/miniWatch.html b/projects/project_pages/miniWatch.html new file mode 100644 index 0000000..6584a55 --- /dev/null +++ b/projects/project_pages/miniWatch.html @@ -0,0 +1,46 @@ + + + + + + + + + + + + Mini Watch + + +
+ + + +
+

Mini Watch

+ +

My desire to make a watch on par with the Apple Watch led me to this project. Did I fulfill my goal? Not quite, + but it made me realize the progress in low-cost microcontrollers over the years and opened my eyes to intense amount of engineering and R&D Apple undertakes in order to create the Apple Watch.

+ + + + +
+ +
+ + + \ No newline at end of file diff --git a/projects/projects.css b/projects/projects.css index df24905..f17d3bd 100644 --- a/projects/projects.css +++ b/projects/projects.css @@ -7,19 +7,25 @@ @media only screen and (max-width: 620px) { /* For mobile phones: */ - img{ + .card{ width: 100%; } } +#projectsContent { + margin-right: 16px; +} + .cardContent { margin: 16px; + margin-right: 0; padding: 16px; - background: #333; + background: #ddd; border-radius: 16px; border: #666; border-width: 2px; display: block; + color: #000; transition: 0.3s box-shadow; } @@ -30,12 +36,7 @@ } .cardContent:hover { - margin: 16px; - padding: 16px; - background: #444; - border-radius: 16px; + background: #eee; border: #666; box-shadow: 0 4px 8px 0 rgba(0,0,0,0.5); - border-width: 2px; - display: block; } diff --git a/projects/projects.js b/projects/projects.js index 497a8b3..f37e84a 100644 --- a/projects/projects.js +++ b/projects/projects.js @@ -25,19 +25,19 @@ data.push({ title: "Differential Drive Robot", organization: "", img: "differentialRobot.png", - href: "project_pages/boatTelemetrySystemProject.html" + href: "project_pages/differentialDriveRobot.html" }); data.push({ title: "Mini Watch", organization: "", img: "miniWatch.jpg", - href: "project_pages/boatTelemetrySystemProject.html" + href: "project_pages/miniWatch.html" }); data.push({ title: "Car", organization: "", - img: "car.bmp", - href: "project_pages/boatTelemetrySystemProject.html" + img: "carFrameRendered.bmp", + href: "project_pages/carFrame.html" }); // data.push({ // title: "Boat Telej",