Skip to content

[Feat/#48] 알림이 있을 경우에만 알림이 뜨는 기능 / web font fix #49

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

Merged
daun-up merged 3 commits into from
Feb 25, 2025
Merged

[Feat/#48] 알림이 있을 경우에만 알림이 뜨는 기능 / web font fix #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea4c74e
fix: 웹 브라우저 font error fix
hyeonjin6530 Feb 25, 2025
263eb70
design: test image 변경
hyeonjin6530 Feb 25, 2025
e1cc710
fix: 알림이 있을 경우에만 뜨도록
hyeonjin6530 Feb 25, 2025
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: 2 additions & 0 deletions src/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import url("https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/static/pretendard.min.css");

@tailwind base;
@tailwind components;
@tailwind utilities;
Expand Down
8 changes: 5 additions & 3 deletions src/app/mobile/main/_components/MainHeader/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@ export default function MainHeader({ name }: HeaderProps) {
onClick={() => router.push('/mobile/notification')}
>
<IconAlarm />
<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">
{notificationCount}
</div>
{notificationCount && (
<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">
{notificationCount}
</div>
)}
</button>
<button
className="h-6 w-6 items-center justify-center"
Expand Down
2 changes: 1 addition & 1 deletion src/app/mobile/main/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default function MobileMain() {

const imageUrls = [
'/assets/images/test.png',
'/assets/images/test2.png',
'/assets/images/test.png',
'/assets/images/test.png',
];

Expand Down