From c845f80d109c58786382222db73ac8a3a7122e7b Mon Sep 17 00:00:00 2001 From: saseungmin Date: Sat, 13 Jan 2024 15:31:16 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20font=20=EC=9C=84=EC=B9=98=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20sen=20google=20=ED=8F=B0?= =?UTF-8?q?=ED=8A=B8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - font 위치 변경 및 sen google 폰트 제거 --- .../{fonts => _fonts}/Pretendard-Bold.subset.woff2 | Bin .../Pretendard-Medium.subset.woff2 | Bin .../Pretendard-Regular.subset.woff2 | Bin .../Pretendard-SemiBold.subset.woff2 | Bin src/app/{fonts => _fonts}/index.ts | 12 +----------- src/app/layout.tsx | 6 ++---- src/styles/global.scss | 4 ---- 7 files changed, 3 insertions(+), 19 deletions(-) rename src/app/{fonts => _fonts}/Pretendard-Bold.subset.woff2 (100%) rename src/app/{fonts => _fonts}/Pretendard-Medium.subset.woff2 (100%) rename src/app/{fonts => _fonts}/Pretendard-Regular.subset.woff2 (100%) rename src/app/{fonts => _fonts}/Pretendard-SemiBold.subset.woff2 (100%) rename src/app/{fonts => _fonts}/index.ts (78%) diff --git a/src/app/fonts/Pretendard-Bold.subset.woff2 b/src/app/_fonts/Pretendard-Bold.subset.woff2 similarity index 100% rename from src/app/fonts/Pretendard-Bold.subset.woff2 rename to src/app/_fonts/Pretendard-Bold.subset.woff2 diff --git a/src/app/fonts/Pretendard-Medium.subset.woff2 b/src/app/_fonts/Pretendard-Medium.subset.woff2 similarity index 100% rename from src/app/fonts/Pretendard-Medium.subset.woff2 rename to src/app/_fonts/Pretendard-Medium.subset.woff2 diff --git a/src/app/fonts/Pretendard-Regular.subset.woff2 b/src/app/_fonts/Pretendard-Regular.subset.woff2 similarity index 100% rename from src/app/fonts/Pretendard-Regular.subset.woff2 rename to src/app/_fonts/Pretendard-Regular.subset.woff2 diff --git a/src/app/fonts/Pretendard-SemiBold.subset.woff2 b/src/app/_fonts/Pretendard-SemiBold.subset.woff2 similarity index 100% rename from src/app/fonts/Pretendard-SemiBold.subset.woff2 rename to src/app/_fonts/Pretendard-SemiBold.subset.woff2 diff --git a/src/app/fonts/index.ts b/src/app/_fonts/index.ts similarity index 78% rename from src/app/fonts/index.ts rename to src/app/_fonts/index.ts index 280e1010..15a545cb 100644 --- a/src/app/fonts/index.ts +++ b/src/app/_fonts/index.ts @@ -1,6 +1,6 @@ -import { Sen } from 'next/font/google'; import localFont from 'next/font/local'; +// eslint-disable-next-line import/prefer-default-export export const pretendardFont = localFont({ src: [ { @@ -26,7 +26,6 @@ export const pretendardFont = localFont({ ], display: 'swap', preload: true, - variable: '--font-pretendard', fallback: [ '-apple-system', 'BlinkMacSystemFont', @@ -43,12 +42,3 @@ export const pretendardFont = localFont({ 'sans-serif', ], }); - -export const senFont = Sen({ - subsets: ['latin'], - display: 'swap', - preload: true, - variable: '--font-sen', - adjustFontFallback: false, - fallback: [], -}); diff --git a/src/app/layout.tsx b/src/app/layout.tsx index d6382ed1..2223ae01 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,8 +1,6 @@ -import clsx from 'clsx'; - import TopNavigationBar from '@/components/global/TopNavigationBar'; -import { pretendardFont, senFont } from './fonts'; +import { pretendardFont } from './_fonts'; import 'src/styles/global.scss'; import styles from './index.module.scss'; @@ -16,7 +14,7 @@ function RootLayout({ children }: { children: React.ReactNode }) { return ( - +
diff --git a/src/styles/global.scss b/src/styles/global.scss index 312dee12..6d23a294 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -3,11 +3,7 @@ @import "./mixin/text"; @import "./mixin/functions"; -$font-sen: var(--font-sen); -$font-pretendard: var(--font-pretendard); - html { - font-family: #{$font-sen}, #{$font-pretendard}; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; }