Merge version_4 into main #8

Merged
bender merged 2 commits from version_4 into main 2026-02-24 20:20:55 +00:00
2 changed files with 7 additions and 10 deletions

View File

@@ -5,6 +5,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Ubuntu } from "next/font/google";
import { Inter } from "next/font/google";
import { Archivo } from "next/font/google";
export const metadata: Metadata = {
@@ -28,13 +29,9 @@ export const metadata: Metadata = {
}
};
const ubuntu = Ubuntu({
variable: "--font-ubuntu",
subsets: ["latin"],
weight: ["300", "400", "500", "700"],
});
const inter = Inter({
variable: "--font-inter",
const archivo = Archivo({
variable: "--font-archivo",
subsets: ["latin"],
});
@@ -46,7 +43,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${ubuntu.variable} ${inter.variable} antialiased`}>
<body className={`${archivo.variable} antialiased`}>
<Tag />
{children}

View File

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