Merge pull request #51 from team-Ollie/main

[redeploy]
team-Ollie · Jul 2, 2024 · ca551dd · ca551dd
2 parents 2ce0047 + 08e243d
commit ca551dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/components/NavBar.tsx b/components/NavBar.tsx
@@ -20,7 +20,7 @@ const NavBar = () => {
     <>
       <div className="w-full min-h-[4rem]" />
       <div
-        className="flex flex-basis h-[4rem] w-full fixed inset-x-0 bottom-0 z-9"
+        className="flex flex-basis h-[4rem] w-full fixed inset-x-0 bottom-0 z-20"
         style={{
           borderTop: "0.5px solid rgba(112, 115, 124, 0.16)",
           backgroundColor: "#ffffff",

diff --git a/components/calendar/CalendarModal.tsx b/components/calendar/CalendarModal.tsx
@@ -21,7 +21,7 @@ const CalendarModal = ({
         className="w-screen h-full flex flex-col items-center justify-center fixed bg-[rgba(1,0,0,0.4)] z-10"
         key={programIdx}
       >
-        <div className="flex flex-col relative items-center justify-center w-[80%] h-[60%] bg-white z-10 rounded-xl py-5 px-8 gap-3">
+        <div className="flex flex-col relative items-center justify-center w-[80%] h-[60%] bg-white z-40 rounded-xl py-5 px-8 gap-3">
           <Close className="absolute right-3 top-3" onClick={toggleModal} />
           <div className="h0 text-main-color h-fit">{data.name}</div>
           <div className="flex flex-col mt-3 flex-grow h-full w-full gap-3 overflow-auto scrollbar-hide">