Merge branch 'main' into add-logo-to-header

kantord · kantord · commit 7317fd392134 · 2025-11-20T19:02:54.000+01:00
diff --git a/src/app/globals.css b/src/app/globals.css
@@ -46,8 +46,7 @@
 }
 
 @theme inline {
-  --font-sans: var(--font-geist-sans);
-  --font-mono: var(--font-geist-mono);
+  --font-sans: var(--font-inter);
 
   --color-background: hsl(var(--background));
   --color-foreground: hsl(var(--foreground));
@@ -77,4 +76,5 @@
 body {
   background: hsl(var(--background));
   color: hsl(var(--foreground));
+  font-family: var(--font-inter), sans-serif;
 }
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,19 +1,14 @@
 import type { Metadata } from "next";
-import { Geist, Geist_Mono } from "next/font/google";
+import { Inter } from "next/font/google";
 import { headers } from "next/headers";
 import { Toaster } from "sonner";
 import { Navbar } from "@/components/navbar";
 import { auth } from "@/lib/auth/auth";
 import "@/lib/api-client";
 import "./globals.css";
 
-const geistSans = Geist({
-  variable: "--font-geist-sans",
-  subsets: ["latin"],
-});
-
-const geistMono = Geist_Mono({
-  variable: "--font-geist-mono",
+const inter = Inter({
+  variable: "--font-inter",
   subsets: ["latin"],
 });
 
@@ -33,9 +28,7 @@ export default async function RootLayout({
 
   return (
     <html lang="en">
-      <body
-        className={`${geistSans.variable} ${geistMono.variable} antialiased`}
-      >
+      <body className={`${inter.variable} antialiased`}>
         {session && <Navbar />}
         {children}
         <Toaster

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,7 @@`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@theme inline {`
`49`		`- --font-sans: var(--font-geist-sans);`
`50`		`- --font-mono: var(--font-geist-mono);`
	`49`	`+ --font-sans: var(--font-inter);`
`51`	`50`
`52`	`51`	`--color-background: hsl(var(--background));`
`53`	`52`	`--color-foreground: hsl(var(--foreground));`
`@@ -77,4 +76,5 @@`
`77`	`76`	`body {`
`78`	`77`	`background: hsl(var(--background));`
`79`	`78`	`color: hsl(var(--foreground));`
	`79`	`+ font-family: var(--font-inter), sans-serif;`
`80`	`80`	`}`