bender/abfbede3-5bdb-4f9e-939f-d7f43249514d
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #6

Merged
bender merged 2 commits from version_3 into main 2026-04-20 04:29:45 +00:00
Conversation 0 Commits 2 Files Changed 2 +8 -6
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/layout.tsx
View File

@@ -8,6 +8,7 @@ import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Nunito } from "next/font/google";
import { Montserrat } from "next/font/google";
import { Bernoru } from "next/font/google";
@@ -20,9 +21,10 @@ export const metadata: Metadata = {
};
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
const bernoru = Bernoru({
variable: "--font-bernoru", subsets: ["latin"],
weight: ["400"],
});
export default function RootLayout({
@@ -33,7 +35,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${montserrat.variable} antialiased`}>
<body className={`${bernoru.variable} antialiased`}>
<Tag />
{children}
<script

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

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