Merge version_1 into main

Merge version_1 into main
This commit was merged in pull request #4.
This commit is contained in:
2026-02-24 10:01:38 +00:00
2 changed files with 9 additions and 7 deletions

View File

@@ -6,6 +6,7 @@ import Tag from "@/tag/Tag";
import { Roboto } from "next/font/google";
import { Work_Sans } from "next/font/google";
import { Source_Sans_3 } from "next/font/google";
import { DM_Sans } from "next/font/google";
export const metadata: Metadata = {
@@ -18,12 +19,13 @@ export const metadata: Metadata = {
};
const workSans = Work_Sans({
variable: "--font-work-sans",
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
const sourceSans3 = Source_Sans_3({
variable: "--font-source-sans-3",
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
@@ -35,7 +37,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${workSans.variable} ${sourceSans3.variable} antialiased`}>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}>
<Tag />
{children}

View File

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