Merge version_4 into main #3

Merged
development merged 3 commits from version_4 into main 2025-12-28 13:44:34 +00:00
Showing only changes of commit 421468d924 - Show all commits

View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next";
import { Plus_Jakarta_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const plusJakartaSans = Plus_Jakarta_Sans({
variable: "--font-plus-jakarta-sans",
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
@@ -35,7 +35,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={plusJakartaSans.variable}
className={inter.variable}
>
<Tag />
{children}
@@ -1261,4 +1261,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}