Skip to content
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

Conf: replace fonts #162 #163

Merged
merged 1 commit into from
Jan 23, 2024
Merged

Conf: replace fonts #162 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
847 changes: 825 additions & 22 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added src/assets/fonts/SpoqaHanSansNeo-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added src/assets/fonts/SpoqaHanSansNeo-Light.ttf
View file
Open in desktop
Binary file not shown.
Binary file added src/assets/fonts/SpoqaHanSansNeo-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file added src/assets/fonts/SpoqaHanSansNeo-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added src/assets/fonts/SpoqaHanSansNeo-Thin.ttf
View file
Open in desktop
Binary file not shown.
416 changes: 206 additions & 210 deletions src/chakra/chakraCustomTheme.ts
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/pages/Home/Home.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "@/sass" as *;
@use '@/sass' as *;

.container {
width: 100%;
Expand All @@ -11,7 +11,7 @@
padding-top: 56px;
padding-bottom: 75px;

font-family: "suit", sans-serif;
font-family: 'spoqaHanSans', sans-serif;

-ms-overflow-style: none;
scrollbar-width: none;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/SearchFromHome/SearchFromHome.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
display: flex;
flex-direction: column;

font-family: 'suit', sans-serif;
font-family: 'spoqaHanSans', sans-serif;

color: $neutral900;

Expand Down
29 changes: 25 additions & 4 deletions src/sass/base/_normalize.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,32 @@
//브라우저 스타일 초기화 또는 재설정을 정의합니다.
@font-face {
font-family: "suit"; // 이름 선언
src: url("../../assets/fonts/SUIT-Variable.ttf"); // 내가 저장한 경로!
font-family: 'SpoqaHanSans'; // 이름 선언
src: url('../../assets/fonts/spoqaHanSans-Thin.ttf');
font-weight: 100; // 내가 저장한 경로!
}
@font-face {
font-family: 'SpoqaHanSans'; // 이름 선언
src: url('../../assets/fonts/spoqaHanSans-Light.ttf');
font-weight: 300; // 내가 저장한 경로!
}
@font-face {
font-family: 'SpoqaHanSans'; // 이름 선언
src: url('../../assets/fonts/spoqaHanSans-Regular.ttf');
font-weight: 400; // 내가 저장한 경로!
}
@font-face {
font-family: 'SpoqaHanSans'; // 이름 선언
src: url('../../assets/fonts/spoqaHanSans-Medium.ttf');
font-weight: 500; // 내가 저장한 경로!
}
@font-face {
font-family: 'SpoqaHanSans'; // 이름 선언
src: url('../../assets/fonts/spoqaHanSans-Bold.ttf');
font-weight: 700; // 내가 저장한 경로!
}

:root {
font-family: "suit", sans-serif;
font-family: 'spoqaHanSans', sans-serif;
line-height: 1.5;
font-weight: 400;

Expand All @@ -20,7 +41,7 @@
}

body {
font-family: "suit", sans-serif;
font-family: 'spoqaHanSans', sans-serif;

display: flex;
justify-content: center;
Expand Down