Merge pull request #47 from team-Ollie/main

[deploy] main -> deploy
team-Ollie · Jul 2, 2024 · 0351d80 · 0351d80
2 parents 553a3fa + 36288f7
commit 0351d80
Show file tree

Hide file tree

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

diff --git a/pages/calendar.tsx b/pages/calendar.tsx
@@ -32,7 +32,7 @@ const CalendarPage: NextPage = () => {
           toggleModal={() => setIsModal(false)}
         />
       ) : null}
-      <div className="flex flex-col w-full h-screen pb-[4rem]">
+      <div className="flex flex-col w-full h-screen">
         <HeadFunction title="캘린더" />
         <div className="flex flex-col flex-grow pt-[1.5rem] items-center overflow-auto scrollbar-hide">
           <div className="h-fit w-full flex flex-row justify-start items-end px-[1rem] gap-3">

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -18,7 +18,10 @@ const Home: NextPage = () => {
   };
 
   return (
-    <FlexBox direction="col" className="w-full h-full justify-between">
+    <FlexBox
+      direction="col"
+      className="w-full h-full justify-between overflow-auto scrollbar-hide"
+    >
       <HomeChallenge onNotify={notify} />
       <NavBar />
       <ToastContainer