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

Merge version_2 into main #4

Merged
bender merged 4 commits from version_2 into main 2026-03-03 10:12:54 +00:00
Conversation 0 Commits 4 Files Changed 4 +33 -33
4 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/layout.tsx
View File

@@ -1,17 +1,17 @@
import type { Metadata } from "next";
import { Libre_Baskerville } from "next/font/google";
import { Inter } from "next/font/google";
import { Cormorant_Garamond } from "next/font/google";
import { DM_Sans } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville", subsets: ["latin"],
weight: ["400", "700"],
const cormorantGaramond = Cormorant_Garamond({
variable: "--font-cormorant-garamond", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
});
export const metadata: Metadata = {
@@ -44,7 +44,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${libreBaskerville.variable} ${inter.variable} antialiased`}
className={`${cormorantGaramond.variable} ${dmSans.variable} antialiased`}
>
<Tag />
{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() {
return (
<ThemeProvider
defaultButtonVariant="icon-arrow"
defaultTextAnimation="reveal-blur"
borderRadius="rounded"
contentWidth="small"
sizing="large"
background="aurora"
cardStyle="solid"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="layered"
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="entrance-slide"
borderRadius="soft"
contentWidth="medium"
sizing="mediumLargeSizeLargeTitles"
background="none"
cardStyle="glass-depth"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="light"
>
<div id="nav" data-section="nav">

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-inter), sans-serif;
font-family: var(--font-dm-sans), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
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 */
/* --vw is set by ThemeProvider */
/* --background: #F5ECD7;;
--card: #FBF7F0;;
--foreground: #2C1A0E;;
--primary-cta: #C4714F;;
--secondary-cta: #F5ECD7;;
--accent: #8A9E7B;;
--background-accent: #2C1A0E;; */
/* --background: #f5e8d8;;
--card: #faf5ef;;
--foreground: #1a0f08;;
--primary-cta: #a85a3a;;
--secondary-cta: #d4c5b9;;
--accent: #c89060;;
--background-accent: #8b7355;; */
--background: #F5ECD7;;
--card: #FBF7F0;;
--foreground: #2C1A0E;;
--primary-cta: #C4714F;;
--background: #f5e8d8;;
--card: #faf5ef;;
--foreground: #1a0f08;;
--primary-cta: #a85a3a;;
--primary-cta-text: #F5ECD7;;
--secondary-cta: #F5ECD7;;
--secondary-cta: #d4c5b9;;
--secondary-cta-text: #2C1A0E;;
--accent: #8A9E7B;;
--background-accent: #2C1A0E;;
--accent: #c89060;;
--background-accent: #8b7355;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);