Merge version_4 into main #4

Merged
development merged 3 commits from version_4 into main 2026-01-22 20:51:31 +00:00
Showing only changes of commit 8be9aaa293 - 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", subsets: ["latin"],
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
@@ -36,7 +36,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${plusJakartaSans.variable} antialiased`}
className={`${inter.variable} antialiased`}
>
<Tag />
{children}