Merge pull request #220 from hiddenest/minor/issue-9-optimize-font

chore: Optimize font #9
ghostty-org · Jan 7, 2025 · 2565fe5 · 2565fe5
2 parents 0bf0e14 + 7372720
commit 2565fe5
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/src/components/link/index.tsx b/src/components/link/index.tsx
@@ -1,7 +1,7 @@
 import classNames from "classnames";
 import { SquareArrowOutUpRight } from "lucide-react";
 import NextLink from "next/link";
-import { pretendardVariable } from "../text";
+import { pretendardStdVariable } from "../text";
 import s from "./Link.module.css";
 
 export interface SimpleLink {
@@ -30,11 +30,16 @@ export default function Link({
   return (
     <NextLink
       onClick={onClick}
-      className={classNames(s.link, pretendardVariable.className, className, {
-        [s.weightLight]: weight === "light",
-        [s.weightRegular]: weight === "regular",
-        [s.weightMedium]: weight === "medium",
-      })}
+      className={classNames(
+        s.link,
+        pretendardStdVariable.className,
+        className,
+        {
+          [s.weightLight]: weight === "light",
+          [s.weightRegular]: weight === "regular",
+          [s.weightMedium]: weight === "medium",
+        },
+      )}
       href={href}
       target={isExternal ? "_blank" : ""}
     >

diff --git a/src/components/text/font/pretendard-std-variable.woff2 b/src/components/text/font/pretendard-std-variable.woff2
diff --git a/src/components/text/font/pretendard-variable.woff2 b/src/components/text/font/pretendard-variable.woff2
diff --git a/src/components/text/index.tsx b/src/components/text/index.tsx
@@ -6,11 +6,11 @@ import { JetBrains_Mono } from "next/font/google";
 import { forwardRef, UIEventHandler } from "react";
 import s from "./Text.module.css";
 
-// https://github.com/orioncactus/pretendard
-export const pretendardVariable = localFont({
-  src: "./font/pretendard-variable.woff2",
+// https://github.com/orioncactus/pretendard/tree/main/packages/pretendard-std
+export const pretendardStdVariable = localFont({
+  src: "./font/pretendard-std-variable.woff2",
   display: "auto",
-  variable: "--pretendard-variable",
+  variable: "--pretendard-std-variable",
 });
 
 export const jetbrainsMono = JetBrains_Mono({
@@ -48,7 +48,8 @@ const Text = forwardRef<HTMLElement, TextProps>(function Text(
       ref={ref as any}
       onScroll={onScroll}
       className={classNames(s.text, className, {
-        [pretendardVariable.className]: font === "display" || font === "body",
+        [pretendardStdVariable.className]:
+          font === "display" || font === "body",
         [jetbrainsMono.className]: font === "code",
         [s.weightLight]: weight === "light",
         [s.weightRegular]: weight === "regular",

diff --git a/src/layouts/root-layout/RootLayout.module.css b/src/layouts/root-layout/RootLayout.module.css
@@ -1,5 +1,5 @@
 .rootLayout {
-  font-family: var(--pretendard-variable);
+  font-family: var(--pretendard-std-variable);
 
   & a {
 		color: var(--gray-9);

diff --git a/src/layouts/root-layout/index.tsx b/src/layouts/root-layout/index.tsx
@@ -1,4 +1,4 @@
-import { jetbrainsMono, pretendardVariable } from "@/components/text";
+import { jetbrainsMono, pretendardStdVariable } from "@/components/text";
 import classNames from "classnames";
 import Head from "next/head";
 import s from "./RootLayout.module.css";
@@ -23,7 +23,7 @@ export default function RootLayout({
     <div
       className={classNames(
         s.rootLayout,
-        pretendardVariable.variable,
+        pretendardStdVariable.variable,
         jetbrainsMono.variable,
         className,
       )}