bender/50030178-55e8-4eb9-a45a-3d4ec824c7e3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #2

Merged
bender merged 4 commits from version_3 into main 2026-03-03 18:12:22 +00:00
Conversation 0 Commits 4 Files Changed 4 +17 -21
4 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/layout.tsx
View File

@@ -1,16 +1,12 @@
import type { Metadata } from "next";
import { DM_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import { SF_Pro_Display } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
const sfProDisplay = SF_Pro_Display({
variable: "--font-sf-pro-display", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
export const metadata: Metadata = {
@@ -35,7 +31,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${dmSans.variable} ${inter.variable} antialiased`}
className={`${sfProDisplay.variable} antialiased`}
>
<Tag />
{children}

12
src/app/page.tsx
View File

@@ -16,14 +16,14 @@ export default function LandingPage() {
<ThemeProvider
defaultButtonVariant="text-shift"
defaultTextAnimation="entrance-slide"
borderRadius="soft"
borderRadius="pill"
contentWidth="mediumLarge"
sizing="largeSmallSizeMediumTitles"
background="aurora"
cardStyle="outline"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="radial-glow"
headingFontWeight="light"
background="none"
cardStyle="glass-depth"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="semibold"
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay

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

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-dm-sans), sans-serif;
font-family: var(--font-sf-pro-display), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-dm-sans), sans-serif;
font-family: var(--font-sf-pro-display), sans-serif;
}

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

@@ -4,20 +4,20 @@
/* --background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #ffffff;;
--foreground: #ffffffe6;;
--primary-cta: #ffffff;;
--secondary-cta: #1a1a1a;;
--accent: #a0a0a0;;
--accent: #404040;;
--background-accent: #ffffff;; */
--background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #ffffff;;
--foreground: #ffffffe6;;
--primary-cta: #ffffff;;
--primary-cta-text: #e3deea;;
--secondary-cta: #1a1a1a;;
--secondary-cta-text: #27231f;;
--accent: #a0a0a0;;
--accent: #404040;;
--background-accent: #ffffff;;
/* text sizing - set by ThemeProvider */