Skip to content

Commit 33a3e91

Browse files
authored
Merge pull request #49 from billilge/feature/#48-web-font-fix
[Feat/#48] 알림이 있을 경우에만 알림이 뜨는 기능 / web font fix
2 parents 4f84f87 + e1cc710 commit 33a3e91

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

src/app/globals.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import url("https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/static/pretendard.min.css");
2+
13
@tailwind base;
24
@tailwind components;
35
@tailwind utilities;

src/app/mobile/main/_components/MainHeader/index.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ export default function MainHeader({ name }: HeaderProps) {
4545
onClick={() => router.push('/mobile/notification')}
4646
>
4747
<IconAlarm />
48-
<div className="absolute -right-0.5 -top-0.5 flex h-[13px] w-[13px] items-center justify-center rounded-full bg-warning text-caption-2_midi text-white-primary">
49-
{notificationCount}
50-
</div>
48+
{notificationCount && (
49+
<div className="absolute -right-0.5 -top-0.5 flex h-[13px] w-[13px] items-center justify-center rounded-full bg-warning text-caption-2_midi text-white-primary">
50+
{notificationCount}
51+
</div>
52+
)}
5153
</button>
5254
<button
5355
className="h-6 w-6 items-center justify-center"

src/app/mobile/main/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export default function MobileMain() {
4646

4747
const imageUrls = [
4848
'/assets/images/test.png',
49-
'/assets/images/test2.png',
49+
'/assets/images/test.png',
5050
'/assets/images/test.png',
5151
];
5252

0 commit comments

Comments
 (0)