development/dc6e08fa-a255-4916-a367-1897749704c8
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge version_6 into main

Browse Source 
Merge version_6 into main
This commit was merged in pull request #5.
This commit is contained in:
development
2025-12-22 12:10:10 +00:00
parent f0360a70d7 6328e94328
commit 0d1fc08c5e
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File 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: #fffcfa;; --background: #f8f5f1;
--card: #fffaf7;; --card: #f1ebe8;
--foreground: #220a00;; --foreground: #3d2417;
--primary-cta: #e8590c;; --primary-cta: #d4704c;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;
--accent: #ff8c42;; --accent: #e8a88f;
--background-accent: #e8590c;; --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-work-sans), sans-serif; font-family: var(--font-cormorant-garamond), 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-work-sans), sans-serif; font-family: var(--font-cormorant-garamond), sans-serif;
} }

9
src/app/layout.tsx
View File

@@ -1,12 +1,13 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Work_Sans } from "next/font/google"; import { Cormorant_Garamond } 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 workSans = Work_Sans({ const cormorantGaramond = Cormorant_Garamond({
variable: "--font-work-sans", variable: "--font-cormorant-garamond",
subsets: ["latin"], subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -39,7 +40,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${workSans.variable} antialiased`} className={`${cormorantGaramond.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}

2
src/app/page.tsx
View File

@@ -18,7 +18,7 @@ export default function LandingPage() {
borderRadius="pill" borderRadius="pill"
contentWidth="large" contentWidth="large"
sizing="largeSizeExtraLargeSpacing" sizing="largeSizeExtraLargeSpacing"
background="dotGrid" background="aurora"
cardStyle="shadow-colored" cardStyle="shadow-colored"
primaryButtonStyle="flat" primaryButtonStyle="flat"
secondaryButtonStyle="glass" secondaryButtonStyle="glass"