bender/d52b236d-519d-43c6-82e3-cfef4994e520
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

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

7 Commits
version_1 ... version_2

Author SHA1 Message Date
bender
4bae18349a Update src/app/styles/variables.css 2026-03-03 10:12:48 +00:00
bender
b35955abae Update src/app/styles/base.css 2026-03-03 10:12:47 +00:00
bender
0c2aa8eb77 Update src/app/page.tsx 2026-03-03 10:12:46 +00:00
bender
15f2bc7e17 Update src/app/layout.tsx 2026-03-03 10:12:44 +00:00
bender
70aaf2afa8 Merge version_1 into main 
Merge version_1 into main
 2026-03-03 01:47:02 +00:00
bender
ea838225f8 Merge version_1 into main 
Merge version_1 into main
 2026-03-03 01:46:07 +00:00
bender
d72bf09ff2 Merge version_1 into main 
Merge version_1 into main
 2026-03-03 01:44:52 +00:00
4 changed files with 33 additions and 33 deletions
Expand all files Collapse all files

16
src/app/layout.tsx
View File

@@ -1,17 +1,17 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Libre_Baskerville } from "next/font/google"; import { Cormorant_Garamond } from "next/font/google";
import { Inter } from "next/font/google"; import { DM_Sans } 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 libreBaskerville = Libre_Baskerville({ const cormorantGaramond = Cormorant_Garamond({
variable: "--font-libre-baskerville", subsets: ["latin"], variable: "--font-cormorant-garamond", subsets: ["latin"],
weight: ["400", "700"], weight: ["300", "400", "500", "600", "700"],
}); });
const inter = Inter({ const dmSans = DM_Sans({
variable: "--font-inter", subsets: ["latin"], variable: "--font-dm-sans", subsets: ["latin"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -44,7 +44,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${libreBaskerville.variable} ${inter.variable} antialiased`} className={`${cormorantGaramond.variable} ${dmSans.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}

18
src/app/page.tsx
View File

@@ -15,15 +15,15 @@ import { Award, BookOpen, Facebook, Globe, Heart, Instagram, Layers, Leaf, Mail,
export default function LandingPage() { export default function LandingPage() {
return ( return (
<ThemeProvider <ThemeProvider
defaultButtonVariant="icon-arrow" defaultButtonVariant="hover-magnetic"
defaultTextAnimation="reveal-blur" defaultTextAnimation="entrance-slide"
borderRadius="rounded" borderRadius="soft"
contentWidth="small" contentWidth="medium"
sizing="large" sizing="mediumLargeSizeLargeTitles"
background="aurora" background="none"
cardStyle="solid" cardStyle="glass-depth"
primaryButtonStyle="primary-glow" primaryButtonStyle="gradient"
secondaryButtonStyle="layered" secondaryButtonStyle="glass"
headingFontWeight="light" headingFontWeight="light"
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">

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-dm-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-libre-baskerville), serif; font-family: var(--font-cormorant-garamond), serif;
} }

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

@@ -2,23 +2,23 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #F5ECD7;; /* --background: #f5e8d8;;
--card: #FBF7F0;; --card: #faf5ef;;
--foreground: #2C1A0E;; --foreground: #1a0f08;;
--primary-cta: #C4714F;; --primary-cta: #a85a3a;;
--secondary-cta: #F5ECD7;; --secondary-cta: #d4c5b9;;
--accent: #8A9E7B;; --accent: #c89060;;
--background-accent: #2C1A0E;; */ --background-accent: #8b7355;; */
--background: #F5ECD7;; --background: #f5e8d8;;
--card: #FBF7F0;; --card: #faf5ef;;
--foreground: #2C1A0E;; --foreground: #1a0f08;;
--primary-cta: #C4714F;; --primary-cta: #a85a3a;;
--primary-cta-text: #F5ECD7;; --primary-cta-text: #F5ECD7;;
--secondary-cta: #F5ECD7;; --secondary-cta: #d4c5b9;;
--secondary-cta-text: #2C1A0E;; --secondary-cta-text: #2C1A0E;;
--accent: #8A9E7B;; --accent: #c89060;;
--background-accent: #2C1A0E;; --background-accent: #8b7355;;
/* 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);