Merge version_7 into main #6

Merged
development merged 2 commits from version_7 into main 2025-12-19 22:51:41 +00:00
Showing only changes of commit 451c1af105 - Show all commits

View File

@@ -1,13 +1,12 @@
import type { Metadata } from "next";
import { Poppins } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const poppins = Poppins({
variable: "--font-poppins",
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export const metadata: Metadata = {
@@ -49,7 +48,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={poppins.variable}
className={inter.variable}
>
<Tag />
{children}