Skip to content

Commit

Permalink
Merge pull request #48 from acm-ucr/dev
Browse files Browse the repository at this point in the history
merge to main
  • Loading branch information
menthy-wu authored Oct 21, 2023
2 parents b2dfbac + 2fd4b5a commit e66a230
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Binary file modified src/app/favicon.ico
Binary file not shown.
12 changes: 6 additions & 6 deletions src/components/Navigation.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ const Navigation = () => {
collapseOnSelect
expand="md"
fixed="top"
className="w-full h-16 md:h-[8vh] flex pb-10 font-playfair !bg-white justify-between items-center"
className="w-full m-0 md:h-[8vh] p-0 flex px-3 py-4 !bg-white justify-between items-center"
>
<Navbar.Brand className="p-0 h-full">
<Navbar.Brand className="p-0 min-h-full">
<Link
onClick={() => setSelected("")}
href="/"
className="items-center flex ml-3 h-full"
className="items-center flex min-h-full"
>
<Image src={blueLogo} className="h-full" />
<Image src={blueLogo} className="h-full p-2" />
</Link>
</Navbar.Brand>
<Navbar.Toggle
Expand All @@ -34,8 +34,8 @@ const Navigation = () => {
>
<FaBars className="text-ewb-blue-200 text-xl" />
</Navbar.Toggle>
<Navbar.Collapse className="items-center md:justify-end justify-center">
<Nav className="mb-2 no-underline text-lg flex items-center gap-2 mr-4">
<Navbar.Collapse className="items-center md:justify-end justify-center h-full">
<Nav className="mb-2 no-underline text-lg flex items-center gap-2 mr-4 h-full">
{navigation.map((item, index) => (
<div key={index}>
{item.sub.length > 0 ? (
Expand Down

0 comments on commit e66a230

Please sign in to comment.