bender/98e18002-af3d-4f2f-9034-7b63e0ade076
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_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_3
Branches Tags
bender:main bender:version_4 bender:version_3 bender:version_2 bender:version_1

5 Commits
version_2 ... version_3

Author SHA1 Message Date
bender
25a2c7fe2c Update theme fonts 2026-05-18 08:51:29 +00:00
bender
728a32ef60 Update theme fonts 2026-05-18 08:51:29 +00:00
bender
0f11311fea Update src/app/styles/variables.css 2026-05-18 08:50:57 +00:00
bender
8ecba7ce72 Update src/app/page.tsx 2026-05-18 08:50:56 +00:00
bender
a07b7bfa3b Merge version_2 into main 
Merge version_2 into main
 2026-05-18 08:49:16 +00:00
4 changed files with 12 additions and 10 deletions
Expand all files Collapse all files

12
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 { Open_Sans } from "next/font/google";
@@ -20,14 +21,15 @@ export const metadata: Metadata = {
}, },
}; };
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
const inter = Inter({ const inter = Inter({
variable: "--font-inter", variable: "--font-inter",
subsets: ["latin"], subsets: ["latin"],
}); });
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"],
});
export default function RootLayout({ export default function RootLayout({
children, children,
@@ -37,7 +39,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}> <body className={`${inter.variable} ${openSans.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

2
src/app/page.tsx
View File

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

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-open-sans), 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-dm-sans), sans-serif; font-family: var(--font-inter), sans-serif;
} }

4
src/app/styles/variables.css
View File

@@ -12,12 +12,12 @@
--background: #f5f4ef; --background: #f5f4ef;
--card: #dad6cd; --card: #dad6cd;
--foreground: #2a2928; --foreground: #1a1a1a;
--primary-cta: #2a2928; --primary-cta: #2a2928;
--primary-cta-text: #f5f4ef; --primary-cta-text: #f5f4ef;
--secondary-cta: #ecebea; --secondary-cta: #ecebea;
--secondary-cta-text: #2a2928; --secondary-cta-text: #2a2928;
--accent: #ffffff; --accent: #c6b180;
--background-accent: #c6b180; --background-accent: #c6b180;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */