diff --git a/public/font/Pretendard-Black.woff b/public/font/Pretendard-Black.woff new file mode 100644 index 00000000..d07848c8 Binary files /dev/null and b/public/font/Pretendard-Black.woff differ diff --git a/public/font/Pretendard-Bold.woff b/public/font/Pretendard-Bold.woff new file mode 100644 index 00000000..7837ae52 Binary files /dev/null and b/public/font/Pretendard-Bold.woff differ diff --git a/public/font/Pretendard-ExtraBold.woff b/public/font/Pretendard-ExtraBold.woff new file mode 100644 index 00000000..8058b761 Binary files /dev/null and b/public/font/Pretendard-ExtraBold.woff differ diff --git a/public/font/Pretendard-ExtraLight.woff b/public/font/Pretendard-ExtraLight.woff new file mode 100644 index 00000000..f9498d85 Binary files /dev/null and b/public/font/Pretendard-ExtraLight.woff differ diff --git a/public/font/Pretendard-Light.woff b/public/font/Pretendard-Light.woff new file mode 100644 index 00000000..2cad6082 Binary files /dev/null and b/public/font/Pretendard-Light.woff differ diff --git a/public/font/Pretendard-Medium.woff b/public/font/Pretendard-Medium.woff new file mode 100644 index 00000000..53704091 Binary files /dev/null and b/public/font/Pretendard-Medium.woff differ diff --git a/public/font/Pretendard-Regular.woff b/public/font/Pretendard-Regular.woff new file mode 100644 index 00000000..e3b3a358 Binary files /dev/null and b/public/font/Pretendard-Regular.woff differ diff --git a/public/font/Pretendard-SemiBold.woff b/public/font/Pretendard-SemiBold.woff new file mode 100644 index 00000000..682e7a45 Binary files /dev/null and b/public/font/Pretendard-SemiBold.woff differ diff --git a/public/font/Pretendard-Thin.woff b/public/font/Pretendard-Thin.woff new file mode 100644 index 00000000..d28e4486 Binary files /dev/null and b/public/font/Pretendard-Thin.woff differ diff --git a/public/fonts/Pretendard-Black.subset.woff2 b/public/fonts/Pretendard-Black.subset.woff2 deleted file mode 100644 index 5f983530..00000000 Binary files a/public/fonts/Pretendard-Black.subset.woff2 and /dev/null differ diff --git a/public/fonts/Pretendard-Bold.subset.woff2 b/public/fonts/Pretendard-Bold.subset.woff2 deleted file mode 100644 index f80bdb72..00000000 Binary files a/public/fonts/Pretendard-Bold.subset.woff2 and /dev/null differ diff --git a/public/fonts/Pretendard-ExtraBold.subset.woff2 b/public/fonts/Pretendard-ExtraBold.subset.woff2 deleted file mode 100644 index b67ca481..00000000 Binary files a/public/fonts/Pretendard-ExtraBold.subset.woff2 and /dev/null differ diff --git a/public/fonts/Pretendard-ExtraLight.subset.woff2 b/public/fonts/Pretendard-ExtraLight.subset.woff2 deleted file mode 100644 index d9f065f6..00000000 Binary files a/public/fonts/Pretendard-ExtraLight.subset.woff2 and /dev/null differ diff --git a/public/fonts/Pretendard-Light.subset.woff2 b/public/fonts/Pretendard-Light.subset.woff2 deleted file mode 100644 index 5d4fa6c1..00000000 Binary files a/public/fonts/Pretendard-Light.subset.woff2 and /dev/null differ diff --git a/public/fonts/Pretendard-Medium.subset.woff2 b/public/fonts/Pretendard-Medium.subset.woff2 deleted file mode 100644 index 94199805..00000000 Binary files a/public/fonts/Pretendard-Medium.subset.woff2 and /dev/null differ diff --git a/public/fonts/Pretendard-Regular.subset.woff2 b/public/fonts/Pretendard-Regular.subset.woff2 deleted file mode 100644 index 6fc8ec42..00000000 Binary files a/public/fonts/Pretendard-Regular.subset.woff2 and /dev/null differ diff --git a/public/fonts/Pretendard-SemiBold.subset.woff2 b/public/fonts/Pretendard-SemiBold.subset.woff2 deleted file mode 100644 index 38175ff0..00000000 Binary files a/public/fonts/Pretendard-SemiBold.subset.woff2 and /dev/null differ diff --git a/public/fonts/Pretendard-Thin.subset.woff2 b/public/fonts/Pretendard-Thin.subset.woff2 deleted file mode 100644 index c92f5b01..00000000 Binary files a/public/fonts/Pretendard-Thin.subset.woff2 and /dev/null differ diff --git a/src/app/global.css b/src/app/global.css index 2ce8f640..4c24832a 100644 --- 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 index 8b2de448..951d0758 100644 --- 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,