bender/a64ffd4f-1355-4fb9-b6d6-01852c0e2a74
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

9 Commits
version_3 ... main

Author SHA1 Message Date
bender
48672eed8a Merge version_4 into main 
Merge version_4 into main
 2026-06-11 13:45:24 +00:00
bender
1227c9f9a0 Update theme fonts 2026-06-11 13:45:18 +00:00
bender
6fdb8175a6 Update theme fonts 2026-06-11 13:45:18 +00:00
bender
584472e887 Merge version_4 into main 
Merge version_4 into main
 2026-06-11 13:44:20 +00:00
bender
36a3bd1070 Update src/app/page.tsx 2026-06-11 13:44:14 +00:00
bender
adcf0ee7e7 Merge version_4 into main 
Merge version_4 into main
 2026-06-11 13:43:44 +00:00
bender
10891fea7b Update src/app/page.tsx 2026-06-11 13:43:38 +00:00
bender
ea6ff50547 Merge version_3 into main 
Merge version_3 into main
 2026-06-11 13:35:14 +00:00
bender
5e25a89ef3 Merge version_3 into main 
Merge version_3 into main
 2026-06-11 13:34:47 +00:00
2 changed files with 7 additions and 5 deletions
Expand all files Collapse all files

8
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 { DM_Sans } from "next/font/google"; import { DM_Sans } from "next/font/google";
import { Montserrat } from "next/font/google";
@@ -41,8 +42,9 @@ export const metadata: Metadata = {
}, },
}; };
const dmSans = DM_Sans({
variable: "--font-dm-sans", const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -54,7 +56,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${dmSans.variable} antialiased`}> <body className={`${montserrat.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-font-family: var(--font-dm-sans), sans-serif;), sans-serif; font-family: var(--font-montserrat), sans-serif;), 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-font-family: var(--font-dm-sans), sans-serif;), sans-serif; font-family: var(--font-montserrat), sans-serif;), sans-serif;
} }