bender/6fc8aa77-3a0a-478f-848a-a9bb3c6b2fe2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_4
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

18 Commits
version_4 ... main

Author SHA1 Message Date
bender
bad6e88a65 Switch to version 3: modified src/app/styles/base.css 2026-04-19 05:44:55 +00:00
bender
c592318069 Switch to version 3: modified src/app/layout.tsx 2026-04-19 05:44:55 +00:00
bender
1112594063 Merge version_4 into main 
Merge version_4 into main
 2026-04-16 21:21:28 +00:00
bender
40127ffeaf Merge version_4 into main 
Merge version_4 into main
 2026-04-16 21:21:00 +00:00
bender
3666d92936 Merge version_4 into main 
Merge version_4 into main
 2026-04-16 21:19:36 +00:00
bender
4f0f3f5cc6 Merge version_4 into main 
Merge version_4 into main
 2026-04-16 21:19:18 +00:00
bender
0979a2bf9b Merge version_4 into main 
Merge version_4 into main
 2026-04-16 21:19:08 +00:00
bender
32932bd5a8 Merge version_4 into main 
Merge version_4 into main
 2026-04-16 21:18:38 +00:00
bender
e01eab7a47 Merge version_4 into main 
Merge version_4 into main
 2026-04-16 21:18:34 +00:00
bender
6a008439e7 Merge version_4 into main 
Merge version_4 into main
 2026-04-16 20:36:09 +00:00
bender
1effb06010 Merge version_4 into main 
Merge version_4 into main
 2026-04-16 20:35:43 +00:00
bender
7392986c2b Merge version_4 into main 
Merge version_4 into main
 2026-04-16 20:35:25 +00:00
bender
611994b323 Merge version_4 into main 
Merge version_4 into main
 2026-04-16 20:35:12 +00:00
bender
376bc175e2 Merge version_4 into main 
Merge version_4 into main
 2026-04-16 20:34:33 +00:00
bender
0fec14d8b1 Merge version_4 into main 
Merge version_4 into main
 2026-04-16 20:21:11 +00:00
bender
4b15ca5229 Merge version_3 into main 
Merge version_3 into main
 2026-04-16 20:19:37 +00:00
bender
d4f1c666fa Merge version_2 into main 
Merge version_2 into main
 2026-04-16 20:19:16 +00:00
bender
e6a59d1360 Merge version_1 into main 
Merge version_1 into main
 2026-04-16 20:15:15 +00:00
2 changed files with 6 additions and 22 deletions
Expand all files Collapse all files

24
src/app/layout.tsx
View File

@@ -7,11 +7,6 @@ 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 { Archivo } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Manrope } from "next/font/google";
import { Montserrat } from "next/font/google";
@@ -25,21 +20,10 @@ export const metadata: Metadata = {
}, },
}; };
const roboto = Roboto({
variable: "--font-roboto",
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"], subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
}); });
export default function RootLayout({ export default function RootLayout({
@@ -50,7 +34,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${montserrat.variable} antialiased`}> <body className={`${roboto.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-montserrat), sans-serif; font-family: var(--font-roboto), 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-montserrat), sans-serif; font-family: var(--font-roboto), sans-serif;
} }