From 0114f1065c6677724e1ac228e0bb8ba6f73955a3 Mon Sep 17 00:00:00 2001
From: saintnoodle <14948290+saintnoodle@users.noreply.github.com>
Date: Tue, 12 Dec 2023 17:06:55 +0000
Subject: [PATCH] fix: header overflow (#980)

fixes a bug introduced by a previous "fix"
---
 client/src/components/layout/header/Header.tsx     | 12 ++++++------
 client/src/components/layout/header/HeaderMenu.tsx |  5 +----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/client/src/components/layout/header/Header.tsx b/client/src/components/layout/header/Header.tsx
index fc78e7308..3e276f630 100644
--- a/client/src/components/layout/header/Header.tsx
+++ b/client/src/components/layout/header/Header.tsx
@@ -1,7 +1,7 @@
 import React, { useContext, useEffect, useState } from "react";
 import { Link } from "react-router-dom";
 import Container from "react-bootstrap/Container";
-import { Navbar, Offcanvas, OffcanvasHeader } from "react-bootstrap";
+import { Navbar, Offcanvas } from "react-bootstrap";
 import SiteWordmark from "components/util/SiteWordmark";
 import SignOut from "components/util/SignOut";
 import { UserContext } from "context/UserContext";
@@ -44,7 +44,7 @@ export default function Header({ styles }: { styles: LayoutStyles }) {
 						show={showMobileMenu}
 						onHide={() => setShowMobileMenu(false)}
 					>
-						<OffcanvasHeader className="p-4 border-bottom border-body-tertiary">
+						<Offcanvas.Header className="p-4 border-bottom border-body-tertiary">
 							<Link
 								id="home"
 								to="/"
@@ -52,17 +52,17 @@ export default function Header({ styles }: { styles: LayoutStyles }) {
 							>
 								<SiteWordmark id="navbar-label" width="192px" />
 							</Link>
-						</OffcanvasHeader>
+						</Offcanvas.Header>
 						<Offcanvas.Body className="d-flex flex-column">
 							<HeaderMenu
 								user={user}
 								dropdownMenuStyle={dropdownMenuStyle}
 								setState={setState}
 							/>
-							<div className="pb-4 px-4 d-md-none">
-								<SignOut className="w-100" />
-							</div>
 						</Offcanvas.Body>
+						<div className="d-flex bottom-0 pb-2 px-4 d-lg-none">
+							<SignOut className="w-100" />
+						</div>
 					</Navbar.Offcanvas>
 					<UserArea user={user} dropdownMenuStyle={dropdownMenuStyle} />
 				</Container>
diff --git a/client/src/components/layout/header/HeaderMenu.tsx b/client/src/components/layout/header/HeaderMenu.tsx
index caf1bd6ce..99a3eb891 100644
--- a/client/src/components/layout/header/HeaderMenu.tsx
+++ b/client/src/components/layout/header/HeaderMenu.tsx
@@ -41,10 +41,7 @@ export function HeaderMenu({
 	}, [error, data]);
 
 	return (
-		<Nav
-			as="nav"
-			className="p-4 d-flex align-content-between gap-4 h-100 overflow-y-auto overflow-x-hidden"
-		>
+		<Nav as="nav" className="p-4 d-flex align-content-between gap-4 h-100">
 			{user && ugs && ugs.length !== 0 && (
 				<UGPTDropdown
 					user={user}