Merge version_7 into main #6

Merged
development merged 2 commits from version_7 into main 2026-01-06 06:26:11 +00:00
Showing only changes of commit 1848446732 - Show all commits

View File

@@ -1,13 +1,12 @@
import type { Metadata } from "next";
import { DM_Serif_Display } from "next/font/google";
import { Mulish } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const dmSerifDisplay = DM_Serif_Display({
variable: "--font-dm-serif-display",
const mulish = Mulish({
variable: "--font-mulish",
subsets: ["latin"],
weight: ["400"],
});
export const metadata: Metadata = {
@@ -52,7 +51,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={dmSerifDisplay.variable}
className={mulish.variable}
>
<Tag />
{children}