bender/2d358320-2285-42c8-ad00-fa33c861cdd0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_8 into main #17

Merged
bender merged 2 commits from version_8 into main 2026-06-10 08:16:46 +00:00
Conversation 0 Commits 2 Files Changed 2 +11 -5
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/layout.tsx
View File

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

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

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