let navbar choose its own height

varianter · Nov 1, 2023 · 82e82ce · 82e82ce
1 parent 7849eb1
commit 82e82ce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/frontend/src/app/globals.css b/frontend/src/app/globals.css
@@ -126,7 +126,7 @@
   .layout-grid {
     display: grid;
     grid-template-columns: auto 1fr;
-    grid-template-rows: 60px 1fr;
+    grid-template-rows: auto 1fr;
     grid-template-areas:
       "header header"
       "sidebar main";

diff --git a/frontend/src/components/NavBar/NavBar.tsx b/frontend/src/components/NavBar/NavBar.tsx
@@ -4,7 +4,7 @@ import NavBarUserIcon from "./NavBarUserIcon";
 
 export default function NavBar() {
   return (
-    <div className="bg-primary_default w-full flex flex-row justify-between header">
+    <div className="bg-primary_default w-full h-[52px] flex flex-row justify-between header">
       <div className="flex flex-row">
         <NavBarLink text="Bemanning" path={`bemanning`} />
       </div>

diff --git a/frontend/src/components/StaffingSidebar.tsx b/frontend/src/components/StaffingSidebar.tsx
@@ -29,9 +29,7 @@ export default function StaffingSidebar() {
         <>
           <button
             onClick={() => setIsSidebarHidden(false)}
-            className={`bg-primary_l3 rounded-r p-2 mt-6 hover:bg-primary_default hover:bg-opacity-20 ${
-              isSidebarHidden && "hidden"
-            }`}
+            className="bg-primary_l3 rounded-r p-2 mt-6 hover:bg-primary_default hover:bg-opacity-20"
           >
             <Filter className="text-primary_default" size="20" />
           </button>