Skip to content

Commit 8c64eec

Browse files
authored
Navbar fixes (#62)
* fix nav * fix header * change tracks sizing
1 parent 9e52146 commit 8c64eec

File tree

7 files changed

+23
-24
lines changed

7 files changed

+23
-24
lines changed

app/page.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,21 @@ const Home = () => {
1212
<Background>
1313
<main className="flex flex-col">
1414
<Navbar routes={routes} />
15-
<Header />
15+
<div id="header" className="w-full h-screen">
16+
<Header />
17+
</div>
1618
<div id="theme" className="flex flex-col items-center justify-center h-screen text-white">
1719
<RetroRemix />
1820
</div>
19-
21+
2022
<div className="flex flex-col items-center justify-center min-h-screen text-white"></div>
21-
{/* TODO: move to correct spot -- leaving tracks here for now */}
22-
<div className="min-h-screen w-full">
23+
<div className="h-auto w-full">
2324
<Tracks />
2425
</div>
2526
<div className="flex flex-col items-center justify-center min-h-screen text-white"></div>
2627
<div id="about" className="flex flex-col items-center justify-center min-h-screen text-white">section</div>
2728
<div id="schedule" className="flex flex-col items-center justify-center min-h-screen text-white mt-[150px]">
28-
<Schedule/>
29+
<Schedule />
2930
</div>
3031
<div id="faqs" className="flex flex-col items-center justify-center min-h-screen text-white">section</div>
3132
<div className="flex flex-col items-center justify-center min-h-screen text-white"><ApplyNow /></div>

app/tracks/Tracks.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import SectionTitle from "@/components/SectionTitle";
1010

1111
const Tracks = () => {
1212
return (
13-
<div>
13+
<div className="mx-5 md:mx-40">
1414
{/* Title for the section */}
1515
<div className="flex justify-center items-center">
16-
<div className="relative w-1/2 isolate">
16+
<div className="relative w-3/4 md:w-1/2 isolate">
1717
<Image
1818
src={sunglare}
1919
alt="sunglare"
@@ -28,7 +28,7 @@ const Tracks = () => {
2828
</div>
2929
</div>
3030

31-
<div>
31+
<div className="mt-10">
3232
<Track trackNum={1} imgSrc={leaf} alignment={1} />
3333
<Track trackNum={2} imgSrc={orange} alignment={3} />
3434
<Track trackNum={3} imgSrc={disk} alignment={1} />
@@ -38,4 +38,4 @@ const Tracks = () => {
3838
);
3939
};
4040

41-
export default Tracks;
41+
export default Tracks;

app/tracks/components/track.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ const Track = ({ trackNum, imgSrc, alignment }: TrackProps) => {
3838
<Image
3939
src={imgSrc}
4040
alt={`Track ${trackNum}`}
41-
className="w-1/2 h-auto object-cover track-image"
41+
className="md:w-1/2 h-auto object-cover track-image"
4242
onClick={() => setExpandedTrack(!expandedTrack)}
4343
/>
4444
{expandedTrack ? (
4545
<Image
4646
src={alignment === 1 ? expandedBlueLeft : alignment === 3 ? expandedBlueRight : expandedBlueLeft}
4747
alt="Expanded"
48-
className="w-1/2 h-auto object-cover track-image img-shadow"
48+
className="md:w-1/2 h-auto object-cover track-image img-shadow"
4949
onClick={() => setExpandedTrack(false)}
5050
/>
5151
) : (
5252
<Image
5353
src={alignment === 1 ? expandWhiteLeft : alignment === 3 ? expandWhiteRight : expandWhiteLeft}
5454
alt="Expand"
55-
className="w-1/2 h-auto object-cover track-image img-shadow"
55+
className="md:w-1/2 h-auto object-cover track-image img-shadow"
5656
onClick={() => setExpandedTrack(true)}
5757
/>
5858
)}

components/Background.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const Background = ({ showCity = true, className, children }: BackgroundProps):
6464
alt="Waterbead"
6565
/>
6666

67-
<div className="relative z-20 pt-1">
67+
<div className="relative z-20">
6868
{children}
6969
</div>
7070
</div>

components/Header.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import LoginSponsorButton from "@/components/LoginSponsorButton";
1010

1111
const Header = () => {
1212
return (
13-
<header className="relative w-full min-h-screen flex flex-col items-center justify-center overflow-visible">
13+
<header className="relative w-full h-full flex flex-col items-center justify-center overflow-visible">
1414
{/* Background splash effect */}
1515
<div className="absolute inset-0 z-0">
1616
<Image
1717
src={splash}
1818
alt="Water splash background"
1919
fill
20-
className="scale-150 overflow-visible opacity-70 translate-x-10 md:translate-x-60 lg:translate-y-[50%] pointer-events-none"
20+
className="scale-150 overflow-visible opacity-70 translate-x-10 md:translate-x-60 pointer-events-none"
2121
priority
2222
/>
2323
</div>
@@ -66,7 +66,7 @@ const Header = () => {
6666
/>
6767
</div>
6868

69-
<div className="absolute left-[-140px] md:left-[-300px] top-[70%] md:top-[62%] -translate-y-1/2 lg:mt-[20%] z-20 w-[320px] h-[320px] md:w-[1020px] md:h-[1020px]">
69+
<div className="absolute left-[-140px] md:left-[-300px] top-[70%] md:top-[62%] -translate-y-1/2 z-20 w-[320px] h-[320px] md:w-[1020px] md:h-[1020px]">
7070
<Image
7171
src={fishFlower}
7272
alt="Fish with flower"
@@ -76,7 +76,7 @@ const Header = () => {
7676
/>
7777
</div>
7878

79-
<div className="absolute right-0 top-1/2 -translate-y-1/2 z-20 w-[120px] h-[120px] md:w-[360px] md:h-[360px] lg:mt-[20%]">
79+
<div className="absolute right-0 top-1/2 -translate-y-1/2 z-20 w-[120px] h-[120px] md:w-[360px] md:h-[360px]">
8080
<Image
8181
src={fishComputer}
8282
alt="Fish with computer"
@@ -148,7 +148,7 @@ const Header = () => {
148148
</div>
149149

150150

151-
<div className="relative z-50 mt-8 flex flex-col gap-4 items-center pointer-events-auto lg:mt-[30%]"
151+
<div className="relative z-50 mt-8 flex flex-col gap-4 items-center pointer-events-auto"
152152
>
153153
<LoginSponsorButton></LoginSponsorButton>
154154
</div>

components/Navbar.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ const Navbar = ({ routes }: NavbarProps) => {
5757

5858
return (
5959
<>
60-
<nav className="w-full items-center justify-between px-10 md:py-5 py-10 md:fixed flex z-100">
61-
<div>
60+
<nav className="absolute w-full items-center justify-between px-10 py-5 md:fixed flex z-100">
61+
<div className="">
6262
<Link href="/">
63-
<Image src={logo} alt="logo" />
63+
<Image src={logo} alt="logo" className="md:w-16 md:h-16 w-12 h-12" />
6464
</Link>
6565

6666
<Link href="https://mlh.io" target="_blank" rel="noreferrer">
67-
<Image src={MLHTrustBadge} alt="MLH Trust Badge" className="h-30 w-auto -top-2 left-[45vw] md:left-[150px] absolute" />
67+
<Image src={MLHTrustBadge} alt="MLH Trust Badge" className="h-15 md:h-30 w-auto top-0 left-[110px] md:left-[150px] absolute" />
6868
</Link>
6969
</div>
7070
<div className="hidden md:flex gap-[1vw] px-4">

components/SectionTitle.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import glass from "@/public/trackTitle.svg";
44
const SectionTitle = ({ title }: { title: string }) => {
55
return (
66
<div className="flex justify-center items-center">
7-
{/* <div className="relative w-1/2 isolate"> */}
87
<Image
98
src={glass}
109
alt="Title"
@@ -16,7 +15,6 @@ const SectionTitle = ({ title }: { title: string }) => {
1615
>
1716
{title}
1817
</span>
19-
{/* </div> */}
2018
</div>
2119
);
2220
};

0 commit comments

Comments
 (0)