Merge version_2 into main #1

Merged
development merged 3 commits from version_2 into main 2025-12-26 00:47:15 +00:00
Showing only changes of commit 3ea66c4393 - Show all commits

View File

@@ -1,13 +1,19 @@
import type { Metadata } from "next";
import { Prata } from "next/font/google";
import { Inter } from "next/font/google";
import { Merriweather } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const prata = Prata({
variable: "--font-prata",
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
weight: ["400"],
});
const merriweather = Merriweather({
variable: "--font-merriweather",
subsets: ["latin"],
weight: ["300", "400", "700", "900"],
});
export const metadata: Metadata = {
@@ -41,7 +47,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${prata.variable} antialiased`}
className={`${inter.variable} ${merriweather.variable} antialiased`}
>
<Tag />
{children}
@@ -1267,4 +1273,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}