3 Commits

Author SHA1 Message Date
4cfb8ebcea Merge version_3 into main
Merge version_3 into main
2026-02-10 22:56:31 +00:00
b3e3d6a572 Update theme fonts 2026-02-10 22:56:27 +00:00
1b0151a441 Update theme fonts 2026-02-10 22:56:26 +00:00
2 changed files with 14 additions and 5 deletions

View File

@@ -4,6 +4,8 @@ import { Source_Sans_3 } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { DM_Sans } from "next/font/google";
import { Inter } from "next/font/google";
const workSans = Work_Sans({
variable: "--font-work-sans", subsets: ["latin"],
@@ -34,6 +36,15 @@ export const metadata: Metadata = {
}
};
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -42,9 +53,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;
}