bender/3a6e61c2-f89f-4247-95f5-2fbdc2b689c4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main

Browse Source 
Merge version_4 into main
This commit was merged in pull request #7.
This commit is contained in:
bender
2026-02-18 16:18:31 +00:00
parent 2508ebfb12 fe7dfecc44
commit e837a437f2
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/layout.tsx
View File

@@ -3,6 +3,8 @@ import { Archivo } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
import { DM_Sans } from "next/font/google";
import { Inter } from "next/font/google";
const archivo = Archivo({ const archivo = Archivo({
variable: "--font-archivo", subsets: ["latin"], variable: "--font-archivo", subsets: ["latin"],
@@ -30,6 +32,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({ export default function RootLayout({
children, children,
}: Readonly<{ }: Readonly<{
@@ -38,9 +49,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body className={`${dmSans.variable} ${inter.variable} antialiased`}>
className={archivo.variable}
>
<Tag /> <Tag />
{children} {children}

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