bender/6d2c7bd3-cf6d-4daa-a9e2-83da94001e42
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #7

Merged
bender merged 2 commits from version_4 into main 2026-04-12 05:49:29 +00:00
Conversation 0 Commits 2 Files Changed 2 +13 -5
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
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 { Playfair_Display, Lato } from "next/font/google";
import { Montserrat } from "next/font/google";
@@ -20,8 +21,15 @@ export const metadata: Metadata = {
},
};
const playfair = Playfair_Display({ variable: "--font-playfair", subsets: ["latin"] });
const lato = Lato({ variable: "--font-lato", subsets: ["latin"], weight: ["400", "700"] });
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
@@ -31,7 +39,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${playfair.variable} ${lato.variable} antialiased`}>
<body className={`${montserrat.variable} ${inter.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-lato), sans-serif;
font-family: var(--font-inter), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-playfair), serif;
font-family: var(--font-montserrat), sans-serif;
}