Merge branch 'main' of https://github.com/Team-Blitz-Steady/steady-cl…

…ient into feat/#252/feature
Team-Blitz-Steady · Nov 24, 2023 · 40b2f12 · 40b2f12
2 parents 4156d69 + adfcb01
commit 40b2f12
Show file tree

Hide file tree

Showing 20 changed files with 47 additions and 7 deletions.
diff --git a/public/font/Pretendard-Black.woff b/public/font/Pretendard-Black.woff
diff --git a/public/font/Pretendard-Bold.woff b/public/font/Pretendard-Bold.woff
diff --git a/public/font/Pretendard-ExtraBold.woff b/public/font/Pretendard-ExtraBold.woff
diff --git a/public/font/Pretendard-ExtraLight.woff b/public/font/Pretendard-ExtraLight.woff
diff --git a/public/font/Pretendard-Light.woff b/public/font/Pretendard-Light.woff
diff --git a/public/font/Pretendard-Medium.woff b/public/font/Pretendard-Medium.woff
diff --git a/public/font/Pretendard-Regular.woff b/public/font/Pretendard-Regular.woff
diff --git a/public/font/Pretendard-SemiBold.woff b/public/font/Pretendard-SemiBold.woff
diff --git a/public/font/Pretendard-Thin.woff b/public/font/Pretendard-Thin.woff
diff --git a/public/fonts/Pretendard-Black.subset.woff2 b/public/fonts/Pretendard-Black.subset.woff2
diff --git a/public/fonts/Pretendard-Bold.subset.woff2 b/public/fonts/Pretendard-Bold.subset.woff2
diff --git a/public/fonts/Pretendard-ExtraBold.subset.woff2 b/public/fonts/Pretendard-ExtraBold.subset.woff2
diff --git a/public/fonts/Pretendard-ExtraLight.subset.woff2 b/public/fonts/Pretendard-ExtraLight.subset.woff2
diff --git a/public/fonts/Pretendard-Light.subset.woff2 b/public/fonts/Pretendard-Light.subset.woff2
diff --git a/public/fonts/Pretendard-Medium.subset.woff2 b/public/fonts/Pretendard-Medium.subset.woff2
diff --git a/public/fonts/Pretendard-Regular.subset.woff2 b/public/fonts/Pretendard-Regular.subset.woff2
diff --git a/public/fonts/Pretendard-SemiBold.subset.woff2 b/public/fonts/Pretendard-SemiBold.subset.woff2
diff --git a/public/fonts/Pretendard-Thin.subset.woff2 b/public/fonts/Pretendard-Thin.subset.woff2
diff --git a/src/app/global.css b/src/app/global.css
@@ -68,13 +68,54 @@
 
 @layer base {
   @font-face {
-    font-family: "Pretendard";
-    src: url("/fonts/pretendard-regular.subset.woff2") format("woff2");
-    font-display: swap;
+    font-family: Pretendard;
+    font-weight: 100;
+    src: url("@/public/font/Pretendard-Thin.woff") format("woff");
   }
+  @font-face {
+    font-family: Pretendard;
+    font-weight: 200;
+    src: url("@/public/font/Pretendard-ExtraLight.woff") format("woff");
+  }
+  @font-face {
+    font-family: Pretendard;
+    font-weight: 300;
+    src: url("@/public/font/Pretendard-Light.woff") format("woff");
+  }
+  @font-face {
+    font-family: Pretendard;
+    font-weight: 400;
+    src: url("@/public/font/Pretendard-Regular.woff") format("woff");
+  }
+  @font-face {
+    font-family: Pretendard;
+    font-weight: 500;
+    src: url("@/public/font/Pretendard-Medium.woff") format("woff");
+  }
+  @font-face {
+    font-family: Pretendard;
+    font-weight: 600;
+    src: url("@/public/font/Pretendard-SemiBold.woff") format("woff");
+  }
+  @font-face {
+    font-family: Pretendard;
+    font-weight: 700;
+    src: url("@/public/font/Pretendard-Bold.woff") format("woff");
+  }
+  @font-face {
+    font-family: Pretendard;
+    font-weight: 800;
+    src: url("@/public/font/Pretendard-ExtraBold.woff") format("woff");
+  }
+  @font-face {
+    font-family: Pretendard;
+    font-weight: 900;
+    src: url("@/public/font/Pretendard-Black.woff") format("woff");
+  }
+
   * {
     @apply border-border;
-    font-family: "Pretendard";
+
     ::-webkit-scrollbar {
       width: 8px;
     }
@@ -90,5 +131,6 @@
   }
   body {
     @apply bg-background text-foreground;
+    @apply font-pretendard;
   }
 }
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -1,5 +1,3 @@
-import { fontFamily } from "tailwindcss/defaultTheme";
-
 /** @type {import('tailwindcss').Config} */
 const px0_10 = { ...Array.from(Array(11)).map((_, i) => `${i}px`) };
 const px0_100 = { ...Array.from(Array(101)).map((_, i) => `${i}px`) };
@@ -41,7 +39,7 @@ module.exports = {
     },
     extend: {
       fontFamily: {
-        pretendard: ["Pretendard", ...fontFamily.sans],
+        pretendard: ["Pretendard"],
       },
       width: px0_1300,
       height: px0_1300,