bender/65723149-e87b-451e-b6c3-13f35d7dd22c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

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

10 Commits
version_2 ... main

Author SHA1 Message Date
bender
8d8ce51701 Merge version_2 into main 
Merge version_2 into main
 2026-04-23 22:29:20 +00:00
bender
14295bfe2b Merge version_1 into main 
Merge version_1 into main
 2026-04-23 22:28:52 +00:00
bender
e9e2a1a299 Update theme fonts 2026-04-23 22:28:48 +00:00
bender
28867b2546 Update theme fonts 2026-04-23 22:28:48 +00:00
bender
e84fbe5761 Merge version_1 into main 
Merge version_1 into main
 2026-04-23 22:28:43 +00:00
bender
07329f42db Merge version_2 into main 
Merge version_2 into main
 2026-04-23 22:28:42 +00:00
bender
fafef02e94 Update theme fonts 2026-04-23 22:28:40 +00:00
bender
2ba8d4c10d Update theme fonts 2026-04-23 22:28:39 +00:00
bender
d3ccc84b4c Merge version_2 into main 
Merge version_2 into main
 2026-04-23 22:28:05 +00:00
bender
356db85cc6 Merge version_2 into main 
Merge version_2 into main
 2026-04-23 22:27:28 +00:00
2 changed files with 16 additions and 4 deletions
Expand all files Collapse all files

16
src/app/layout.tsx
View File

@@ -7,6 +7,8 @@ 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 { Roboto } from "next/font/google"; import { Roboto } from "next/font/google";
import { Open_Sans } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
@@ -23,7 +25,17 @@ export const metadata: Metadata = {
}, },
}; };
const roboto = Roboto({ variable: "--font-roboto", subsets: ["latin"], weight: ["100", "300", "400", "500", "700", "900"] });
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({ export default function RootLayout({
children, children,
@@ -33,7 +45,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${roboto.variable} antialiased`}> <body className={`${libreBaskerville.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-roboto), 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-roboto), sans-serif; font-family: var(--font-libre-baskerville), serif;
} }