Skip to content

Commit e411085

Browse files
committed
Fixed overflow on navbar by moving links to the same div as logo and moving terminal to the div below + Modified link text to scale relative to viewport
1 parent c768fea commit e411085

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

frontend/src/components/Navbar.tsx

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,33 @@ const Navbar = () => {
1313
}, []);
1414

1515
return (
16-
<nav className="sticky top-0 flex justify-between items-center relative z-10 shadow-lg rounded-md bg-black/15 backdrop-blur-md xl:px-24 md:px-10 px-5 py-6">
17-
<div>
16+
<nav className="sticky top-0 flex flex-col relative z-10 shadow-lg rounded-md bg-black/15 backdrop-blur-md xl:px-24 md:px-10 px-5 py-6">
17+
<div className="flex justify-between items-center">
1818
<Link href="/">
1919
<Image
2020
src="/assets/csesoc_logo.svg"
2121
alt="CSESoc Logo"
2222
width={200}
2323
height={200}
2424
draggable={false}
25+
className="w-28 h-auto md:w-36 lg:w-48"
2526
/>
2627
</Link>
27-
<p className="font-mono mt-3 font-bold">
28-
<span className="text-green-500">csesoc@unsw</span>
29-
<span>:</span>
30-
<span className="text-blue-500">~{path.map(segment => '/' + segment.toLowerCase())}</span>
31-
<span>$ </span>
32-
{/* The interactive terminal that allows changing pages using 'cd' */}
33-
<Terminal/>
34-
</p>
35-
</div>
36-
<div>
37-
<div className="md:flex xl:gap-18 lg:gap-10 md:gap-5 text-right font-bold hidden">
28+
<div className="text-[1.7vw] xl:text-xl md:flex xl:gap-18 lg:gap-10 md:gap-5 text-right font-bold hidden">
3829
<Link href="/about">
39-
<div className="text-xl">{'//'} about us</div>
30+
<div>{'//'} about us</div>
4031
</Link>
4132
<Link href="/events">
42-
<div className="text-xl">{'//'} events</div>
33+
<div>{'//'} events</div>
4334
</Link>
4435
<Link href="/resources">
45-
<div className="text-xl">{'//'} resources</div>
36+
<div>{'//'} resources</div>
4637
</Link>
4738
<Link href="/sponsors">
48-
<div className="text-xl">{'//'} sponsors</div>
39+
<div>{'//'} sponsors</div>
4940
</Link>
5041
<Link href="/contact-us">
51-
<div className="text-xl">{'//'} contact us</div>
42+
<div>{'//'} contact us</div>
5243
</Link>
5344
<a target="_blank" href="https://csesoc-merch.square.site/" className='flex'>
5445
<Image
@@ -63,6 +54,16 @@ const Navbar = () => {
6354
<div className="md:hidden xl:hidden lg:hidden text-right font-bold block">
6455
<Hamburger />
6556
</div>
57+
</div>
58+
<div>
59+
<p className="font-mono mt-3 font-bold">
60+
<span className="text-green-500">csesoc@unsw</span>
61+
<span>:</span>
62+
<span className="text-blue-500">~{path.map(segment => '/' + segment.toLowerCase())}</span>
63+
<span>$ </span>
64+
{/* The interactive terminal that allows changing pages using 'cd' */}
65+
<Terminal/>
66+
</p>
6667
</div>
6768
</nav>
6869
);

0 commit comments

Comments
 (0)