bender/ad203e00-8e5e-4bb4-88ba-388daeb536fa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-04-20 12:02:17 +00:00
Conversation 0 Commits 2 Files Changed 2 +6 -4
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/layout.tsx
View File

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Mulish } from "next/font/google";
import { DM_Sans } from "next/font/google";
@@ -23,8 +24,9 @@ export const metadata: Metadata = {
},
};
const mulish = Mulish({
variable: "--font-mulish",
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
const inter = Inter({
@@ -40,7 +42,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${mulish.variable} ${inter.variable} antialiased`}>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}>
<Tag />
{children}
<script

2
src/app/styles/base.css
View File

@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-mulish), sans-serif;
font-family: var(--font-dm-sans), sans-serif;
}