Merge version_2 into main

Merge version_2 into main
This commit was merged in pull request #1.
This commit is contained in:
2026-01-19 23:07:16 +00:00
2 changed files with 6 additions and 7 deletions

View File

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

View File

@@ -1,12 +1,11 @@
import type { Metadata } from "next";
import { Prata } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const prata = Prata({
variable: "--font-prata", subsets: ["latin"],
weight: ["400"],
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
@@ -39,7 +38,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${prata.variable} antialiased`}
className={`${inter.variable} antialiased`}
>
<Tag />
{children}