Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#29 style: navbar ui 수정 #46

Merged
merged 2 commits into from
Jul 2, 2024
Merged

#29 style: navbar ui 수정 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2026f4
#29 style: navbar ui 수정
leejin-rho Jul 2, 2024
64c3328
#29 fix: navbar z-index 수정
leejin-rho Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion components/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pages/calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
5 changes: 4 additions & 1 deletion pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,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
Expand Down