Merge branch 'develop' into feature/BookmarkModify

Team-return · Dec 14, 2023 · 227d000 · 227d000
2 parents 06b7349 + d10e8a3
commit 227d000
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/public/fonts/Pretendard-Bold.woff2 b/public/fonts/Pretendard-Bold.woff2
diff --git a/public/fonts/Pretendard-Medium.woff2 b/public/fonts/Pretendard-Medium.woff2
diff --git a/public/fonts/Pretendard-Regular.woff2 b/public/fonts/Pretendard-Regular.woff2
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,12 +1,24 @@
-import "./globals.css";
-import { Noto_Sans_KR } from "@next/font/google";
 import Header from "@/components/common/Header";
 import Provider from "@/components/Provider";
 import SEOConfig from "@/components/SEO";
+import localFont from "@next/font/local";
+import "./globals.css";
 
-const notoSans = Noto_Sans_KR({
-  weight: ["400", "500", "700"],
-  subsets: ["latin"],
+const pretendard = localFont({
+  src: [
+    {
+      path: "../../public/fonts/Pretendard-Bold.woff2",
+      weight: "700",
+    },
+    {
+      path: "../../public/fonts/Pretendard-Medium.woff2",
+      weight: "500",
+    },
+    {
+      path: "../../public/fonts/Pretendard-Regular.woff2",
+      weight: "400",
+    },
+  ],
   display: "swap",
 });
 
@@ -21,7 +33,7 @@ export default function RootLayout({
       <body
         className={
           "w-screen py-[68px] md:px-[17.5vw] sm:px-[7.5vw] min-h-screen " +
-          notoSans.className
+          pretendard.className
         }
       >
         <Provider>