bender/a7680647-eeaf-45f3-8ef3-9309b2963c42
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_1
Branches Tags
bender:main bender:version_2 bender:version_1
...
pull from: bender:main
Branches Tags
bender:main bender:version_2 bender:version_1

5 Commits
version_1 ... main

Author SHA1 Message Date
bender
cabadfdcfd Merge version_2 into main 
Merge version_2 into main
 2026-04-26 18:30:23 +00:00
bender
c13c66d443 Update src/app/styles/base.css 2026-04-26 18:30:20 +00:00
bender
40cb0632b9 Update src/app/page.tsx 2026-04-26 18:30:20 +00:00
bender
3a6adaf678 Update src/app/layout.tsx 2026-04-26 18:30:19 +00:00
bender
1d9ac94620 Merge version_1 into main 
Merge version_1 into main
 2026-04-26 18:27:11 +00:00
3 changed files with 9 additions and 8 deletions
Expand all files Collapse all files

13
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 { DM_Sans } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
@@ -20,13 +21,13 @@ export const metadata: Metadata = {
},
};
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville", subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
variable: "--font-inter", subsets: ["latin"],
});
export default function RootLayout({
@@ -37,7 +38,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
<Tag />
{children}
<script

2
src/app/page.tsx
View File

@@ -173,4 +173,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

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

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