Merge version_4 into main #3

Merged
development merged 3 commits from version_4 into main 2026-01-27 03:51:05 +00:00
Showing only changes of commit cc3ca36448 - Show all commits

View File

@@ -1,12 +1,11 @@
import type { Metadata } from "next";
import { Cormorant_Garamond } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const cormorantGaramond = Cormorant_Garamond({
variable: "--font-cormorant-garamond", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
@@ -37,7 +36,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={cormorantGaramond.variable}
className={inter.variable}
>
<Tag />
{children}