Skip to content

Commit

Permalink
🎨 restructures header, navigation, hero image
Browse files Browse the repository at this point in the history
  • Loading branch information
sjproctor committed Apr 17, 2024
1 parent 0def58c commit b7e55c1
Show file tree
Hide file tree
Showing 18 changed files with 98 additions and 154 deletions.
Binary file added public/fonts/Alice-Regular.ttf
Binary file not shown.
Binary file added src/assets/hero-mobile.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/hero.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/leaf-decoration.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/logo.png
Binary file not shown.
17 changes: 0 additions & 17 deletions src/components/HeaderLogo.jsx

This file was deleted.

25 changes: 25 additions & 0 deletions src/components/NavigationBarScroll.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import NavigationScrollLogo from "./NavigationScrollLogo"
import PageLink from "./PageLink"
import ScrollLink from "./ScrollLink"
import { Navbar } from "flowbite-react"

const NavigationBarScroll = () => {
return (
<Navbar fluid>
<NavigationScrollLogo />
<div>
<Navbar.Toggle />
</div>
<Navbar.Collapse>
<ScrollLink linkName="celebration" location="#celebration" />
<ScrollLink linkName="helpful information" location="#info" />
<ScrollLink linkName="our story" location="#our-story" />
<ScrollLink linkName="photo gallery" location="#photos" />
<ScrollLink linkName="contact us" location="#contact" />
<PageLink linkName="rsvp" location="/rsvp" />
</Navbar.Collapse>
</Navbar>
)
}

export default NavigationBarScroll
25 changes: 0 additions & 25 deletions src/components/NavigationMain.jsx

This file was deleted.

17 changes: 17 additions & 0 deletions src/components/NavigationScrollLogo.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import leafLogo from "../assets/leaf-decoration.png"

const NavigationScrollLogo = () => {
const handleScrollToTop = () => {
window.scrollTo({ top: 0, behavior: "smooth" })
}
return (
<img
src={leafLogo}
className="mr-2 w-20 hover:cursor-pointer"
alt="Kayti and Jake wedding logo"
onClick={handleScrollToTop}
/>
)
}

export default NavigationScrollLogo
2 changes: 1 addition & 1 deletion src/components/PageLink.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const PageLink = ({ linkName, location }) => {
return (
<Link
to={location}
className="border-gray-100 text-gray-700 hover:bg-gray-50 md:hover:bg-transparent block border-b py-2 pl-3 pr-4 hover:cursor-pointer md:border-0 md:p-0"
className="md:hover:bg-transparent text-gray block border-b px-3 py-2 font-alice text-xs uppercase hover:cursor-pointer md:border-0 md:p-0"
>
{linkName}
</Link>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ScrollLink.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const ScrollLink = ({ linkName, location }) => {
return (
<AnchorLink
href={location}
className="border-gray-100 text-gray-700 hover:bg-gray-50 md:hover:bg-transparent block border-b py-2 pl-3 pr-4 hover:cursor-pointer md:border-0 md:p-0"
className="md:hover:bg-transparent text-gray block border-b px-3 py-2 font-alice text-xs uppercase hover:cursor-pointer md:border-0 md:p-0"
>
{linkName}
</AnchorLink>
Expand Down
7 changes: 4 additions & 3 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
font-family: "Garamond";
src: url("../fonts/EBGaramond-Medium.ttf");
}
@font-face {
font-family: "Alice";
src: url("../fonts/Alice-Regular.ttf");
}
}

:root {
margin: 0;
font-family: Garamond;
font-size: 16pt;
width: 100vw;
color: #121f32;
background-image: url(./assets/background.png);
background-attachment: fixed;
}
22 changes: 11 additions & 11 deletions src/pages/Main.jsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import NavigationMain from "../components/NavigationMain"
import NavigationBarScroll from "../components/NavigationBarScroll"
import AboveTheFold from "../sections/AboveTheFold"
import Celebration from "../sections/Celebration"
import Ceremony from "../sections/Ceremony"
import Contact from "../sections/Contact"
import Landing from "../sections/Hero"
import HelpfulInfo from "../sections/HelpfulInfo"
import OurStory from "../sections/OurStory"
import PhotoGallery from "../sections/PhotoGallery"
import SummaryText from "../sections/SummaryText"

const Main = () => {
return (
<>
<div className="hover:cursor-pointer">
<NavigationMain />
<div className="sticky top-0 z-10">
<NavigationBarScroll />
</div>
<Landing />
<hr className="m-8" />
<AboveTheFold />
<SummaryText />
<Celebration />
<hr className="m-8" />
<HelpfulInfo />
<OurStory />
<hr className="m-8" />
<Ceremony />
<hr className="m-8" />
<PhotoGallery />
<Contact />
<hr className="m-8" />
</>
Expand Down
46 changes: 0 additions & 46 deletions src/pages/PhotoGallery.jsx

This file was deleted.

33 changes: 33 additions & 0 deletions src/sections/AboveTheFold.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import hero from "../assets/hero.jpeg"
import heroMobile from "../assets/hero-mobile.jpeg"

const AboveTheFold = () => {
return (
<>
{/* mobile view */}
<div className="text-center md:hidden">
<img
src={heroMobile}
alt="Kayti and Jake sitting outdoors in the foreground of a mountain with wispy clouds in the sky"
className="opacity-50"
/>
<div className="absolute left-0 right-0 top-20">
<h1 className="font-moontime text-6xl">Kayti and Jake</h1>
</div>
</div>
{/* full screen view */}
<div className="hidden text-center md:contents">
<img
src={hero}
alt="Kayti and Jake sitting outdoors in the foreground of a mountain with wispy clouds in the sky"
className="object-cover opacity-50"
/>
<div className="absolute left-0 right-0 top-20">
<h1 className="font-moontime text-9xl">Kayti and Jake</h1>
</div>
</div>
</>
)
}

export default AboveTheFold
30 changes: 0 additions & 30 deletions src/sections/Ceremony.jsx

This file was deleted.

18 changes: 0 additions & 18 deletions src/sections/Hero.jsx

This file was deleted.

8 changes: 6 additions & 2 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default {
},
screens: {
sm: "640px",
md: "768px",
md: "1000px",
lg: "1024px",
xl: "1280px",
"2xl": "1536px"
Expand All @@ -30,7 +30,11 @@ export default {
greenGold: "#b2935b",
greenGoldLight: "#ded1b8",
blackFont: "#121f32",
error: "#cc0000"
error: "#cc0000",
champagne: "#f7e7ce",
eucalyptus: "#465c47",
white: "#ffffff",
gray: "#6c6868"
},
opacity: {
50: ".50"
Expand Down

0 comments on commit b7e55c1

Please sign in to comment.