bender/f5e9b832-23df-4fce-b3ef-598e29e9ef31
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_9 into main

Browse Source 
Merge version_9 into main
This commit was merged in pull request #11.
This commit is contained in:
bender
2026-06-09 23:11:05 +00:00
parent 871fdb5071 64cdfe8fba
commit 9e759ef745
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/layout.tsx
View File

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Inter_Tight } from "next/font/google"; import { Inter_Tight } from "next/font/google";
import { Open_Sans } from "next/font/google";
@@ -40,10 +41,15 @@ export const metadata: Metadata = {
}, },
}; };
const interTight = Inter_Tight({
variable: "--font-inter-tight",
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"], subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
}); });
export default function RootLayout({ export default function RootLayout({
@@ -54,7 +60,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${interTight.variable} antialiased`}> <body className={`${inter.variable} ${openSans.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

4
src/app/styles/base.css
View File

@@ -11,7 +11,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-inter), sans-serif; font-family: var(--font-open-sans), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-libre-baskerville), serif; font-family: var(--font-inter), sans-serif;
} }