feat: swap to general sans font

trycompai · Feb 13, 2025 · 14ad8f3 · 14ad8f3
1 parent 169deee
commit 14ad8f3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/apps/app/public/fonts/GeneralSans-Variable.ttf b/apps/app/public/fonts/GeneralSans-Variable.ttf
diff --git a/apps/app/public/fonts/GeneralSans-VariableItalic.ttf b/apps/app/public/fonts/GeneralSans-VariableItalic.ttf
diff --git a/apps/app/src/app/[locale]/layout.tsx b/apps/app/src/app/[locale]/layout.tsx
@@ -8,6 +8,7 @@ import { GeistMono } from "geist/font/mono";
 import { GeistSans } from "geist/font/sans";
 import type { Metadata } from "next";
 import { SessionProvider } from "next-auth/react";
+import localFont from "next/font/local";
 import { NuqsAdapter } from "nuqs/adapters/next/app";
 import { Toaster } from "sonner";
 import { extractRouterConfig } from "uploadthing/server";
@@ -67,6 +68,12 @@ export const viewport = {
   ],
 };
 
+const font = localFont({
+  src: "/../../../public/fonts/GeneralSans-Variable.ttf",
+  display: "swap",
+  variable: "--font-general-sans",
+});
+
 export const preferredRegion = ["auto"];
 export const maxDuration = 5;
 
@@ -91,7 +98,7 @@ export default async function Layout(props: {
     <html lang={locale} suppressHydrationWarning>
       <body
         className={cn(
-          `${GeistSans.variable} ${GeistMono.variable}`,
+          `${GeistMono.variable} ${font.variable}`,
           "whitespace-pre-line overscroll-none antialiased",
         )}
       >

diff --git a/packages/ui/tailwind.config.ts b/packages/ui/tailwind.config.ts
@@ -9,7 +9,7 @@ export default withUt({
     extend: {
       colors: {
         fontFamily: {
-          sans: "var(--font-geist-sans)",
+          sans: "var(--font-general-sans)",
           mono: "var(--font-geist-mono)",
         },
         border: "hsl(var(--border))",