Skip to content

Commit ad1f2e6

Browse files
committed
Merge branch 'dev' into feat/write#19
2 parents 06c4c9f + ca5539a commit ad1f2e6

File tree

9 files changed

+29
-10
lines changed

9 files changed

+29
-10
lines changed

public/1Stars.webp

13.5 KB
Loading

public/2Stars.webp

14.5 KB
Loading

public/CocktailDrop_4x.webp

666 KB
Loading

public/fonts/Hahmlet-Bold.ttf

1.46 MB
Binary file not shown.

public/fonts/Hahmlet-Light.ttf

1.46 MB
Binary file not shown.

public/fonts/Hahmlet-Medium.ttf

1.47 MB
Binary file not shown.

public/fonts/Hahmlet-Regular.ttf

1.46 MB
Binary file not shown.
7.95 MB
Binary file not shown.

src/shared/styles/global.css

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,48 @@
1-
@import url('https://hangeul.pstatic.net/hangeul_static/css/nanum-square-neo.css');
2-
@import url('https://fonts.googleapis.com/css2?family=Hahmlet:[email protected]&display=swap');
31
@import 'tailwindcss';
4-
52
@import './_base.css';
63
@import './_theme.css';
74
@import './_utilities.css';
85
@import './_components.css';
96

7+
/* 1) 로컬 폰트 등록 */
8+
@font-face {
9+
font-family: 'NanumSquareNeo Var';
10+
src: url('/fonts/NanumSquareNeo-Variable.ttf') format('truetype');
11+
font-weight: 100 900;
12+
font-style: normal;
13+
font-display: swap;
14+
}
15+
16+
@font-face { font-family: 'Hahmlet'; src: url('/fonts/Hahmlet-Light.ttf') format('truetype'); font-weight: 300; font-style: normal; font-display: swap; }
17+
@font-face { font-family: 'Hahmlet'; src: url('/fonts/Hahmlet-Regular.ttf') format('truetype'); font-weight: 400; font-style: normal; font-display: swap; }
18+
@font-face { font-family: 'Hahmlet'; src: url('/fonts/Hahmlet-Medium.ttf') format('truetype'); font-weight: 500; font-style: normal; font-display: swap; }
19+
@font-face { font-family: 'Hahmlet'; src: url('/fonts/Hahmlet-Bold.ttf') format('truetype'); font-weight: 700; font-style: normal; font-display: swap; }
20+
21+
22+
/* 2) 기본 폰트 및 색상 설정 */
1023
:root {
11-
font-family: 'NanumSquareNeo', sans-serif;
12-
line-height: 1.5;
13-
font-weight: 500;
1424
color: #fff;
1525
background-color: var(--color-primary);
1626
}
1727

18-
html {
19-
scroll-behavior: auto; /* smooth가 아닌 auto로 */
28+
html { scroll-behavior: auto; }
29+
30+
body {
31+
font-family: 'NanumSquareNeo Var', system-ui, sans-serif;
32+
line-height: 1.5;
33+
font-weight: 500;
2034
}
2135

22-
/* 전역 CSS 또는 글로벌 스타일에서 */
36+
/* 3) font-serif 클래스 사용 시 Hahmlet 적용 */
37+
.font-serif {
38+
font-family: 'Hahmlet', serif !important;
39+
}
40+
41+
/* 4) Swiper 등 외부 컴포넌트도 상속 */
2342
.swiper,
2443
.swiper-slide,
2544
.swiper-button-prev,
2645
.swiper-button-next,
2746
.swiper-pagination {
2847
font-family: inherit !important;
29-
}
48+
}

0 commit comments

Comments
 (0)