Merge version_1 into main

Merge version_1 into main
This commit was merged in pull request #2.
This commit is contained in:
2026-06-10 08:56:25 +00:00
2 changed files with 7 additions and 9 deletions

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 { Open_Sans } from "next/font/google"; import { Open_Sans } from "next/font/google";
import { Source_Sans_3 } from "next/font/google";
@@ -41,12 +42,9 @@ export const metadata: Metadata = {
}, },
}; };
const inter = Inter({
variable: "--font-inter", const sourceSans3 = Source_Sans_3({
subsets: ["latin"], variable: "--font-source-sans-3",
});
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -58,7 +56,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${inter.variable} ${openSans.variable} antialiased`}> <body className={`${sourceSans3.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

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-open-sans), sans-serif; font-family: var(--font-source-sans-3), 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-inter), sans-serif; font-family: var(--font-source-sans-3), sans-serif;
} }