Skip to content

Commit

Permalink
Merge pull request #49 from eunji-0623/feature-jisung
Browse files Browse the repository at this point in the history
fix: 모바일 알림 드롭다운 무한스크롤 버그 수정 및 스타일 수정
  • Loading branch information
Byukchong authored Jul 20, 2024
2 parents 884e67b + b761c54 commit 47d46cf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion components/Layout/NavigationBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default function NavigationBar() {
<div className="relative">
<Image src={notificationIcon} alt="알림 아이콘" />
{data?.totalCount !== undefined && data?.totalCount > 0 && (
<span className="flex justify-center absolute -top-2 -right-2 bg-red-500 w-[15px] h-[15px] text-white text-xs rounded-full px-2">
<span className="flex justify-center items-center absolute -top-2 -right-2 bg-red-500 w-[15px] h-[15px] text-white text-xs rounded-full px-2">
{data.totalCount}
</span>
)}
Expand Down
8 changes: 4 additions & 4 deletions components/NavigationDropdown/NotificationDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,17 @@ export default function NotificationDropdown({
}, []);

return (
<div className="z-50 px-[20px] pt-[17px] pb-[24px] absolute top-[60px] t:right-[100px] w-[368px] h-[340px] animate-slideDown flex-col justify-center overflow-y-auto scrollbar-hide rounded-[5px] m:fixed m:inset-0 m:rounded-none m:w-full m:h-full bg-var-green1 dark:bg-var-dark2 m:overflow-y-hidden ">
<div className="flex text-[20px] font-bold mb-[25px] justify-between ">
<div className="z-50 px-[20px] py-[17px] absolute top-[60px] t:right-[100px] w-[368px] h-[360px] animate-slideDown flex-col justify-center overflow-y-auto scrollbar-hide rounded-[5px] m:fixed m:inset-0 m:rounded-none m:w-full m:h-full bg-var-green1 dark:bg-var-dark2 border-var-dark3 border border-solid">
<div className="flex text-[20px] font-bold mb-[10px] justify-between ">
알림 {data ? `${data.totalCount}` : '0'}
<CloseButton onClick={onClick} />
</div>
{notificationList && data?.totalCount ? (
<div className="flex flex-col items-center gap-[15px]">
<div className="flex flex-col items-center gap-[17px]">
{notificationList.map((notification) => (
<div
key={notification.id}
className="flex-col items-center px-[12px] py-[16px] justify-between rounded-[5px] border-b w-[328px] min-h-[120px] m:w-[335px] bg-white border-gray-200 dark:bg-var-dark4 "
className="flex-col items-center px-[12px] pt-[10px] pb-[7px] justify-between rounded-[5px] border-b w-[328px] min-h-[120px] m:w-[335px] bg-white border-gray-200 dark:bg-var-dark4 "
>
<div className="flex justify-between">
<StatusIndicator
Expand Down

0 comments on commit 47d46cf

Please sign in to comment.