development/a29ab6da-8db9-469a-a344-8bae49489c44
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main

Browse Source 
Merge version_2 into main
This commit was merged in pull request #1.
This commit is contained in:
development
2025-12-28 11:06:15 +00:00
parent d42c35c633 374f3abbc7
commit e185b39c48
2 changed files with 7 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-ibm-plex-sans), 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-ibm-plex-sans), sans-serif;
}

10
src/app/layout.tsx
View File

@@ -1,13 +1,13 @@
import type { Metadata } from "next";
import { DM_Serif_Display } from "next/font/google";
import { IBM_Plex_Sans } 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 ibmPlexSans = IBM_Plex_Sans({
variable: "--font-ibm-plex-sans",
subsets: ["latin"],
weight: ["400"],
weight: ["100", "200", "300", "400", "500", "600", "700"],
});
export const metadata: Metadata = {
@@ -52,7 +52,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={dmSerifDisplay.variable}
className={ibmPlexSans.variable}
>
<Tag />
{children}