Skip to content

[I2-21] Fixed overflow on navbar #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[I2-21] Fixed overflow on navbar #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions frontend/src/components/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,33 @@ const Navbar = () => {
}, []);

return (
<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">
<div>
<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">
<div className="flex justify-between items-center">
<Link href="/">
<Image
src="/assets/csesoc_logo.svg"
alt="CSESoc Logo"
width={200}
height={200}
draggable={false}
className="w-28 h-auto md:w-36 lg:w-48"
/>
</Link>
<p className="font-mono mt-3 font-bold">
<span className="text-green-500">csesoc@unsw</span>
<span>:</span>
<span className="text-blue-500">~{path.map(segment => '/' + segment.toLowerCase())}</span>
<span>$ </span>
{/* The interactive terminal that allows changing pages using 'cd' */}
<Terminal/>
</p>
</div>
<div>
<div className="md:flex xl:gap-18 lg:gap-10 md:gap-5 text-right font-bold hidden">
<div className="text-[1.7vw] xl:text-xl md:flex xl:gap-18 lg:gap-10 md:gap-5 text-right font-bold hidden">
<Link href="/about">
<div className="text-xl">{'//'} about us</div>
<div>{'//'} about us</div>
</Link>
<Link href="/events">
<div className="text-xl">{'//'} events</div>
<div>{'//'} events</div>
</Link>
<Link href="/resources">
<div className="text-xl">{'//'} resources</div>
<div>{'//'} resources</div>
</Link>
<Link href="/sponsors">
<div className="text-xl">{'//'} sponsors</div>
<div>{'//'} sponsors</div>
</Link>
<Link href="/contact-us">
<div className="text-xl">{'//'} contact us</div>
<div>{'//'} contact us</div>
</Link>
<a target="_blank" href="https://csesoc-merch.square.site/" className='flex'>
<Image
Expand All @@ -63,6 +54,16 @@ const Navbar = () => {
<div className="md:hidden xl:hidden lg:hidden text-right font-bold block">
<Hamburger />
</div>
</div>
<div>
<p className="font-mono mt-3 font-bold">
<span className="text-green-500">csesoc@unsw</span>
<span>:</span>
<span className="text-blue-500">~{path.map(segment => '/' + segment.toLowerCase())}</span>
<span>$ </span>
{/* The interactive terminal that allows changing pages using 'cd' */}
<Terminal/>
</p>
</div>
</nav>
);
Expand Down
Loading