Skip to content

Commit 7b9b17d

Browse files
authored
Merge pull request #76 from codersforcauses/issue-73-Navbar_link_alignment
Issue 73 Refactor Navbar component to far right side of the window
2 parents 3e588b4 + 86a0584 commit 7b9b17d

1 file changed

Lines changed: 34 additions & 37 deletions

File tree

client/src/components/main/Navbar.tsx

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -18,44 +18,41 @@ export default function Navbar() {
1818

1919
return (
2020
<>
21-
<header className="sticky top-0 z-50 flex h-24 w-full flex-wrap items-center justify-center rounded-md border-b border-border/20 bg-background px-20 font-jersey10">
22-
<Link
23-
href="/"
24-
className="flex flex-none items-center gap-3 text-2xl md:mr-5"
25-
>
26-
<Image
27-
src="/game_dev_club_logo.svg"
28-
alt="logo"
29-
width={32}
30-
height={32}
31-
className="h-8 w-8"
32-
/>
33-
<span className="sr-only">Game Development UWA</span>
34-
<span aria-hidden="true" className="whitespace-nowrap md:hidden">
35-
GDUWA
36-
</span>
37-
<span
38-
aria-hidden="true"
39-
className="hidden whitespace-nowrap md:inline"
40-
>
41-
Game Development UWA _
42-
</span>
43-
</Link>
44-
45-
<nav className="ml-auto hidden flex-none gap-8 text-xl md:flex">
46-
{navItems.map((item) => (
47-
<Link
48-
key={item.href}
49-
href={item.href}
50-
className="whitespace-nowrap text-foreground/90 transition-colors duration-150 hover:text-primary"
21+
<header className="sticky top-0 z-50 flex h-24 w-full items-center rounded-md border-b border-border/20 bg-background px-20 font-jersey10">
22+
<div className="flex flex-1 items-center">
23+
<Link href="/" className="flex items-center gap-3 text-2xl lg:mr-5">
24+
<Image
25+
src="/game_dev_club_logo.svg"
26+
alt="logo"
27+
width={32}
28+
height={32}
29+
className="h-8 w-8"
30+
/>
31+
<span className="sr-only">Game Development UWA</span>
32+
<span aria-hidden="true" className="whitespace-nowrap md:hidden">
33+
GDUWA
34+
</span>
35+
<span
36+
aria-hidden="true"
37+
className="hidden whitespace-nowrap md:inline"
5138
>
52-
{item.label}
53-
</Link>
54-
))}
55-
</nav>
56-
57-
<div className="ml-auto flex items-center">
58-
<div className="relative md:hidden">
39+
Game Development UWA _
40+
</span>
41+
</Link>
42+
<nav className="ml-auto hidden gap-8 text-xl lg:flex">
43+
{navItems.map((item) => (
44+
<Link
45+
key={item.href}
46+
href={item.href}
47+
className="whitespace-nowrap text-foreground/90 transition-colors duration-150 hover:text-primary"
48+
>
49+
{item.label}
50+
</Link>
51+
))}
52+
</nav>
53+
</div>
54+
<div className="flex items-center lg:hidden">
55+
<div className="relative">
5956
<button
6057
onClick={() => setIsDropdownOpen(!isDropdownOpen)}
6158
className="flex items-center justify-center p-2"

0 commit comments

Comments
 (0)