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 fix: navbar z-index modal이랑 안겹치게 수정 #48

Merged
merged 2 commits into from
Jul 2, 2024
Merged

#29 fix: navbar z-index modal이랑 안겹치게 수정 #48

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
0c65367
#29 fix: navbar z-index modal이랑 안겹치게 수정
leejin-rho Jul 2, 2024
f55edbc
#29 fix: calendar 년, 월은 선택가능하게 수정
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
2 changes: 1 addition & 1 deletion components/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-10"
className="flex flex-basis h-[4rem] w-full fixed inset-x-0 bottom-0 z-9"
style={{
borderTop: "0.5px solid rgba(112, 115, 124, 0.16)",
backgroundColor: "#ffffff",
Expand Down
6 changes: 3 additions & 3 deletions components/challenge/ChallengeCalendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ export default function ChallengeCalendar({
setClickedDate(clickedDate);
};

const disableAllDates = ({ date }) => {
return true;
const disableDates = ({ date, view }) => {
return view === "month";
};

const customTileContent = ({ date, view }: { date: Date; view: string }) => {
Expand Down Expand Up @@ -58,7 +58,7 @@ export default function ChallengeCalendar({
prev2Label={null}
minDate={new Date(2024, 4, 1)}
tileContent={customTileContent}
tileDisabled={disableAllDates}
tileDisabled={disableDates}
/>
</StyledCalendarWrapper>
</div>
Expand Down