development/d37c8f57-24b4-4bec-b998-5d24365a89bf
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_7 into main

Browse Source 
Merge version_7 into main
This commit was merged in pull request #6.
This commit is contained in:
development
2026-01-06 06:26:11 +00:00
parent 02607d1cdf 1848446732
commit c67bc73e9a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/globals.css
View File

@@ -495,7 +495,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-dm-serif-display), sans-serif;
font-family: var(--font-mulish), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-dm-serif-display), sans-serif;
font-family: var(--font-mulish), sans-serif;
}

9
src/app/layout.tsx
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}