bender/d0fab969-e686-4cf8-89d1-e58205012b1e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

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

5 Commits
version_3 ... main

Author SHA1 Message Date
bender
5c34e44a83 Merge version_4 into main 
Merge version_4 into main
 2026-04-17 22:45:02 +00:00
bender
afb9816d7e Update src/app/styles/base.css 2026-04-17 22:44:56 +00:00
bender
9b5ef376b4 Update src/app/layout.tsx 2026-04-17 22:44:55 +00:00
bender
8dabd82f1d Merge version_3 into main 
Merge version_3 into main
 2026-04-17 22:38:55 +00:00
bender
63cd975d13 Merge version_3 into main 
Merge version_3 into main
 2026-04-17 22:38:31 +00:00
2 changed files with 7 additions and 11 deletions
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 Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Libre_Baskerville } from "next/font/google"; import { Libre_Baskerville } from "next/font/google";
import { Figtree } from "next/font/google";
@@ -19,14 +20,9 @@ export const metadata: Metadata = {
}, },
}; };
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville", const figtree = Figtree({
subsets: ["latin"], variable: "--font-figtree", subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
}); });
export default function RootLayout({ export default function RootLayout({
@@ -37,7 +33,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}> <body className={`${figtree.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-inter), sans-serif; font-family: var(--font-figtree), 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-libre-baskerville), serif; font-family: var(--font-figtree), serif;
} }