development/9f93c62e-b307-4715-9243-185af97722d7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: development:version_2
Branches Tags
development:main development:version_3 development:version_2 development:version_1
...
pull from: development:main
Branches Tags
development:main development:version_3 development:version_2 development:version_1

5 Commits
version_2 ... main

Author SHA1 Message Date
development
9b690d2601 Merge version_3 into main 
Merge version_3 into main
 2025-12-21 12:05:39 +00:00
development
7ed56a5264 Update src/app/page.tsx 2025-12-21 12:05:35 +00:00
development
bbe5736d0e Update src/app/layout.tsx 2025-12-21 12:05:34 +00:00
development
65d068e699 Update src/app/globals.css 2025-12-21 12:05:34 +00:00
development
93e32f4964 Merge version_2 into main 
Merge version_2 into main
 2025-12-21 12:03:41 +00:00
3 changed files with 17 additions and 17 deletions
Expand all files Collapse all files

18
src/app/globals.css
View File

@@ -4,13 +4,13 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
--background: #f8faff;; --background: #faf5f2;
--card: #f0f4ff;; --card: #fdf0eb;
--foreground: #1a1a2e;; --foreground: #4a4540;
--primary-cta: #3b82f6;; --primary-cta: #e8b4a0;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;
--accent: #a78bfa;; --accent: #f5d4c8;
--background-accent: #8b5cf6;; --background-accent: #d9a18f;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -495,7 +495,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-source-code-pro), sans-serif; font-family: var(--font-playfair-display), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-source-code-pro), sans-serif; font-family: var(--font-playfair-display), sans-serif;
} }

8
src/app/layout.tsx
View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Source_Code_Pro } from "next/font/google"; import { Playfair_Display } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
const sourceCodePro = Source_Code_Pro({ const playfairDisplay = Playfair_Display({
variable: "--font-source-code-pro", variable: "--font-playfair-display",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -49,7 +49,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={sourceCodePro.variable} className={playfairDisplay.variable}
> >
<Tag /> <Tag />
{children} {children}

8
src/app/page.tsx
View File

@@ -20,10 +20,10 @@ export default function LandingPage() {
borderRadius="soft" borderRadius="soft"
contentWidth="medium" contentWidth="medium"
sizing="small" sizing="small"
background="noiseDiagonalGradient" background="aurora"
cardStyle="solid" cardStyle="glass-elevated"
primaryButtonStyle="diagonal-gradient" primaryButtonStyle="gradient"
secondaryButtonStyle="outline" secondaryButtonStyle="glass"
headingFontWeight="bold" headingFontWeight="bold"
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">