Skip to content

Commit f43cb4b

Browse files
committed
fix: font 프리셋 변경
1 parent f3db4b3 commit f43cb4b

File tree

11 files changed

+83
-68
lines changed

11 files changed

+83
-68
lines changed
1.09 MB
Binary file not shown.
1.09 MB
Binary file not shown.
1.5 MB
Binary file not shown.
-774 KB
Binary file not shown.
1.51 MB
Binary file not shown.
-758 KB
Binary file not shown.
1.5 MB
Binary file not shown.
-747 KB
Binary file not shown.

apps/tuk-web/src/app/invite/meet/src/components/InviteMeet.tsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ const InviteMeet = () => {
3232
}
3333
}
3434

35-
// 애니메이션 트리거
36-
const timeout = setTimeout(() => setAnimateCardIn(true), 100); // 약간의 delay
35+
const timeout = setTimeout(() => setAnimateCardIn(true), 100);
36+
3737
return () => clearTimeout(timeout);
3838
}, []);
3939

@@ -49,23 +49,23 @@ const InviteMeet = () => {
4949
</button>
5050
<div className="flex gap-2.5">
5151
<div className="size-10 rounded-[0.3125rem] bg-gray-500" />
52-
<p className="text-body-14-R">
52+
<p className="pretendard-body-14-R">
5353
앱을 다운받고 편하게 만남을
5454
<br />
5555
이어나가보세요
5656
</p>
5757
</div>
5858
</div>
5959

60-
<div className="rounded-[1.25rem] bg-white-default px-2.5 py-2 text-body-12-B text-black-500">
60+
<div className="pretendard-body-12-B rounded-[1.25rem] bg-white-default px-2.5 py-2 text-black-500">
6161
앱으로 열기
6262
</div>
6363
</div>
6464
)}
6565

6666
<h2
6767
className={cn(
68-
'text-title-22-M text-black-500',
68+
'serif-title-22-M font-bold text-black-500',
6969
showBanner ? 'mt-[6.875rem]' : 'mt-[1.875rem]'
7070
)}
7171
>
@@ -82,27 +82,27 @@ const InviteMeet = () => {
8282
)}
8383
>
8484
<div className="flex justify-end">
85-
<p className="text-body-14-R text-gray-800">
85+
<p className="serif-body-14-R text-gray-800">
8686
다음 만남은 계획대로
8787
<br />
8888
되지 않아 친구들에게
8989
</p>
9090
</div>
9191

92-
<div className="mt-16">
92+
<div className="mt-[4.375rem]">
9393
<QuoteIcon />
94-
<div className="mt-6 flex flex-col gap-2">
95-
<p className="text-body-16-M text-black-500">제주도 여행가서</p>
96-
<p className="text-body-16-M text-black-500">새벽 4시까지</p>
97-
<p className="text-body-16-M text-black-500">전생 이야기 나누기</p>
94+
<div className="mt-[0.8125rem] flex flex-col gap-[0.3125rem]">
95+
<p className="serif-body-16-M text-black-500">제주도 여행가서</p>
96+
<p className="serif-body-16-M text-black-500">새벽 4시까지</p>
97+
<p className="serif-body-16-M text-black-500">전생 이야기 나누기</p>
9898
</div>
9999

100-
<p className="mt-6 text-body-16-M text-black-500">어때</p>
100+
<p className="serif-body-16-M mt-5 text-black-500">어때</p>
101101
</div>
102102

103103
<div className="absolute bottom-0 left-0 flex w-full justify-between px-4 pb-4">
104-
<p className="text-body-12-R text-[#cccccc]">연락이</p>
105-
<p className="text-body-12-R text-[#cccccc]">뜸해진 우리</p>
104+
<p className="serif-body-12-R text-[#cccccc]">연락이</p>
105+
<p className="serif-body-12-R text-[#cccccc]">뜸해진 우리</p>
106106
</div>
107107
</div>
108108

apps/tuk-web/src/styles/globals.css

Lines changed: 67 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,85 @@
44

55
@font-face {
66
font-family: 'Pretendard';
7-
src: url('/fonts/Pretendard-Regular.woff2') format('woff2');
7+
src: url('/fonts/Pretendard-Regular.oft') format('woff2');
88
font-weight: 400;
9-
font-style: normal;
109
font-display: swap;
1110
}
1211

1312
@font-face {
1413
font-family: 'Pretendard';
15-
src: url('/fonts/Pretendard-Medium.woff2') format('woff2');
14+
src: url('/fonts/Pretendard-Medium.oft') format('woff2');
1615
font-weight: 500;
17-
font-style: normal;
1816
font-display: swap;
1917
}
2018

2119
@font-face {
2220
font-family: 'Pretendard';
23-
src: url('/fonts/Pretendard-Bold.woff2') format('woff2');
21+
src: url('/fonts/Pretendard-Bold.otf') format('woff2');
2422
font-weight: 700;
25-
font-style: normal;
2623
font-display: swap;
2724
}
25+
26+
@font-face {
27+
font-family: 'Noto Serif KR';
28+
src: url('/fonts/NotoSans-serif-Regular.otf') format('woff2');
29+
font-weight: 400;
30+
font-display: swap;
31+
}
32+
33+
@font-face {
34+
font-family: 'Noto Serif KR';
35+
src: url('/fonts/NotoSans-serif-Medium.otf') format('woff2');
36+
font-weight: 500;
37+
font-display: swap;
38+
}
39+
40+
@layer utilities {
41+
.pretendard-body-12-R {
42+
@apply font-pretendard text-[12px] font-normal leading-[18px] tracking-[-0.03125rem];
43+
}
44+
45+
.pretendard-body-12-M {
46+
@apply font-pretendard text-[12px] font-medium leading-[18px] tracking-[-0.03125rem];
47+
}
48+
49+
.pretendard-body-12-B {
50+
@apply font-pretendard text-[12px] font-bold leading-[18px] tracking-[-0.03125rem];
51+
}
52+
53+
.pretendard-body-14-R {
54+
@apply font-pretendard text-[14px] font-normal leading-[20px] tracking-[-0.03125rem];
55+
}
56+
57+
.pretendard-body-14-M {
58+
@apply font-pretendard text-[14px] font-medium leading-[20px] tracking-[-0.03125rem];
59+
}
60+
61+
.pretendard-body-16-R {
62+
@apply font-pretendard text-[16px] font-normal leading-[20px] tracking-[-0.03125rem];
63+
}
64+
65+
.serif-body-12-R {
66+
@apply font-noto text-[12px] font-normal leading-[18px] tracking-[-0.0625rem];
67+
}
68+
69+
.serif-body-14-R {
70+
@apply font-noto text-[14px] font-normal leading-[20px] tracking-[-0.0625rem];
71+
}
72+
73+
.serif-body-16-M {
74+
@apply font-noto text-[16px] font-medium leading-[22px] tracking-[-0.0625rem];
75+
}
76+
77+
.serif-body-18-M {
78+
@apply font-noto text-[18px] font-medium leading-[25px] tracking-[-0.0625rem];
79+
}
80+
81+
.serif-title-22-M {
82+
@apply font-noto text-[22px] font-medium leading-[30px] tracking-[-0.09375rem];
83+
}
84+
85+
.serif-title-24-M {
86+
@apply font-noto text-[24px] font-medium leading-[33px] tracking-[-0.09375rem];
87+
}
88+
}

0 commit comments

Comments
 (0)