From c69d20a1627e3b6b19f8b5c28b2f7730b13fe1cf Mon Sep 17 00:00:00 2001 From: eric Date: Tue, 10 Mar 2026 01:58:18 -0500 Subject: [PATCH] 's' --- app/globals.css | 5 ++--- app/layout.tsx | 22 ++++------------------ package.json | 3 +++ pnpm-lock.yaml | 24 ++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/app/globals.css b/app/globals.css index f7449ca..052ef2d 100644 --- a/app/globals.css +++ b/app/globals.css @@ -35,9 +35,8 @@ @theme inline { --color-background: var(--background); --color-foreground: var(--foreground); - --font-sans: var(--font-noto-sans-sc), var(--font-geist-sans), system-ui, - sans-serif; - --font-mono: var(--font-geist-mono); + --font-sans: "Noto Sans SC Variable", "Geist Variable", system-ui, sans-serif; + --font-mono: "Geist Mono Variable", monospace; } body { diff --git a/app/layout.tsx b/app/layout.tsx index d0cdb70..9eb2fc9 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,25 +1,11 @@ import type { Metadata } from "next"; -import { Geist, Geist_Mono, Noto_Sans_SC } from "next/font/google"; +import "@fontsource-variable/geist"; +import "@fontsource-variable/geist-mono"; +import "@fontsource-variable/noto-sans-sc"; import "./globals.css"; import { ThemeProvider } from "./providers/ThemeProvider"; import { themeInitScript } from "./theme-init"; -const geistSans = Geist({ - variable: "--font-geist-sans", - subsets: ["latin"], -}); - -const geistMono = Geist_Mono({ - variable: "--font-geist-mono", - subsets: ["latin"], -}); - -const notoSansSC = Noto_Sans_SC({ - variable: "--font-noto-sans-sc", - subsets: ["latin"], - weight: ["400", "500", "600", "700"], -}); - export const metadata: Metadata = { title: "数字游民实战课 | 从朝九晚五到边旅行边赚钱", description: @@ -35,7 +21,7 @@ export default function RootLayout({ return (