Skip to content

refactor(ui): use next geist fonts #1165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sadmann7 merged 1 commit into from
Oct 2, 2026
Merged

refactor(ui): use next geist fonts #1165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
"date-fns": "^4.4.0",
"drizzle-orm": "^0.45.2",
"export-to-csv": "^1.5.0",
"geist": "^1.7.2",
"lucide-react": "^1.47.0",
"next": "^16.3.5",
"next-themes": "^0.4.6",
Expand Down
12 changes: 0 additions & 12 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 2 additions & 11 deletions src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type { Metadata, Viewport } from "next";

import { cn } from "cn";
import { Inter } from "next/font/google";
import Script from "next/script";
import { Suspense } from "react";

Expand All @@ -14,8 +13,6 @@ import { siteConfig } from "@/lib/site";
import { Toaster } from "@/registry/bases/radix/ui/sonner";
import "@/styles/globals.css";

const inter = Inter({ subsets: ["latin"], variable: "--font-sans" });

export const metadata: Metadata = {
metadataBase: new URL(siteConfig.url),
title: {
Expand Down Expand Up @@ -77,16 +74,10 @@ export default function RootLayout({ children }: React.PropsWithChildren) {
<html
lang="en"
suppressHydrationWarning
className={cn("font-sans", inter.variable)}
className={cn("font-sans", fontSans.variable, fontMono.variable)}
>
<head />
<body
className={cn(
"min-h-screen bg-background font-sans antialiased",
fontSans.variable,
fontMono.variable,
)}
>
<body className="min-h-screen bg-background font-sans antialiased">
<Suspense>
<UploadThingSSR />
</Suspense>
Expand Down
14 changes: 10 additions & 4 deletions src/lib/fonts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import { GeistMono } from "geist/font/mono";
import { GeistSans } from "geist/font/sans";
import { Geist, Geist_Mono } from "next/font/google";

export const fontSans = GeistSans;
export const fontMono = GeistMono;
export const fontSans = Geist({
subsets: ["latin"],
variable: "--font-sans",
});

export const fontMono = Geist_Mono({
subsets: ["latin"],
variable: "--font-mono",
});
Loading