Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/main' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
#	src/app/board/[boardId]/_components/CreatePolaroidModal/index.tsx
#	src/app/board/[boardId]/_components/OpenModalBtn.tsx
#	src/app/board/[boardId]/_components/Share/index.tsx
#	src/app/board/[boardId]/page.tsx
#	src/components/Polaroid/PolaroidDetail/index.tsx
#	src/types/index.ts
  • Loading branch information
junseublim committed Dec 20, 2024
2 parents 48b40e5 + 17bad00 commit 1301bbe
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/components/Polaroid/PolaroidDetail/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ const PolaroidDetailModal = ({
<Modal isOpen={isOpen} onClose={onClose}>
<div className="relative mx-auto flex h-dvh max-w-md flex-1 touch-pan-x flex-col justify-center overflow-x-hidden py-10">
<CloseIcon className="absolute left-5 top-5 cursor-pointer text-gray-0" />
<div
className="absolute left-0 top-0 h-full w-full"
onClick={onClose}
/>
<div className="relative touch-pan-x overflow-x-hidden">
<Carousel
ref={carouselRef}
Expand Down Expand Up @@ -116,10 +120,6 @@ const PolaroidDetailModal = ({
/>
</div>
)}
<div
className="absolute left-0 top-0 h-full w-full"
onClick={onClose}
/>
</div>
</Modal>
)
Expand Down

0 comments on commit 1301bbe

Please sign in to comment.