diff --git a/src/components/Home.js b/src/components/Home.js index 1de9113..b59191b 100644 --- a/src/components/Home.js +++ b/src/components/Home.js @@ -1,9 +1,7 @@ import React from "react"; import "./assets/Home.scss"; -import bot1 from "./assets/img/bot1.png"; -import bot2 from "./assets/img/bot2.png"; +import hero from "./assets/img/olympian_hero.png"; -const BOT_IMAGES = [bot1, bot2]; export default function Home(props) { return ( @@ -14,12 +12,12 @@ export default function Home(props) {

- Moving into the future, one step at a time + The first high school team to build a full-size bipedal humanoid robot.

diff --git a/src/components/Navbar.js b/src/components/Navbar.js index a7bbbf0..9329e94 100644 --- a/src/components/Navbar.js +++ b/src/components/Navbar.js @@ -82,6 +82,12 @@ export default function Navbar(props) { Donate +
  • + {" "} + + Events + +
  • diff --git a/src/components/assets/Home.scss b/src/components/assets/Home.scss index f8b7f59..eb019b6 100644 --- a/src/components/assets/Home.scss +++ b/src/components/assets/Home.scss @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css2?family=Poppins&display=swap"); +@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@600&display=swap"); $mobile: 768px; $tablet: 1024px; @@ -29,7 +29,7 @@ $tablet: 1024px; .hero { pointer-events: none; - height: 86vh; + // height: 86vh; } .landing-header { @@ -39,24 +39,27 @@ $tablet: 1024px; margin-left: 0.4em; #potentia { - margin-top: 0.4em; + padding-left: 0.4em; + z-index: 999 !important; + position: relative; } #robotics { position: relative; - padding-left: 0.4em; + top: -0.3em; + padding-left: 0.8em; z-index: 999 !important; } } .landing-robot { position: absolute; - z-index: 1; - opacity: 0; - left: 40vw; + opacity: 1; + // left: 40vw; overflow: hidden; - animation: navLinkFade 0.5s ease forwards 0.5s; - max-height: 87vh; + // animation: navLinkFade 0.5s ease forwards 0.5s; + // max-height: 87vh; + width: 100%; } @keyframes robotFlyIn { @@ -73,19 +76,21 @@ $tablet: 1024px; .landing-subheader { font-family: "Poppins", sans-serif; - font-size: 1.5vw; + font-size: 3vw; position: absolute; - margin-top: 30vh; - margin-right: 10%; - right: 0; - width: 20%; + margin-top: 60vh; + // margin-right: 10%; + // right: 0; + margin-left: 3em; + z-index: 999 !important; + width: 60%; @include tablet { - display: none; + margin-top: 40vh; } @include mobile { - display: none; + margin-top: 25vh; } a { diff --git a/src/components/assets/Navbar.scss b/src/components/assets/Navbar.scss index a5764ca..978aa8d 100644 --- a/src/components/assets/Navbar.scss +++ b/src/components/assets/Navbar.scss @@ -1,7 +1,7 @@ @import url("https://fonts.googleapis.com/css2?family=Poppins&display=swap"); -$white: rgb(236, 236, 236); -$gray: rgb(197, 197, 197); +$white: rgb(247, 247, 247); +$gray: rgb(172, 172, 172); $black: #000; $mobile: 768px; $tablet: 1024px; @@ -36,21 +36,24 @@ nav { align-items: center; min-height: 10vh; font-family: "Poppins", sans-serif; + padding-bottom: 0.75em; + background: rgb(0, 0, 0); + //linear-gradient(135deg, rgb(80, 100, 147), 95%, #000c40) } .nav-logo { margin-top: 5px; - margin-left: -40px; float: left; - width: 276px; - height: 115px; + width: 167px; + height: 69px; } .nav-links { display: flex; justify-content: space-around; - width: 750px; + width: 900px; z-index: 9999; + padding-top: 10px; @include tablet { width: 40%; @@ -66,7 +69,7 @@ nav { } .active-link { - color: $black !important; + color: $white !important; } .burger { diff --git a/src/components/assets/img/olympian.png b/src/components/assets/img/olympian.png new file mode 100644 index 0000000..185e668 Binary files /dev/null and b/src/components/assets/img/olympian.png differ diff --git a/src/components/assets/img/olympian_hero.png b/src/components/assets/img/olympian_hero.png new file mode 100644 index 0000000..dd695c5 Binary files /dev/null and b/src/components/assets/img/olympian_hero.png differ