Merge version_3 into main

2026-05-07 09:50:39 +00:00
parent 7415c782f2 0c3bae49c6
commit d9c20c2b20
4 changed files with 27 additions and 26 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Open_Sans } from "next/font/google";
+import { Libre_Baskerville } from "next/font/google";



@@ -21,13 +22,13 @@ export const metadata: Metadata = {
  },
 };

-const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
+
+const libreBaskerville = Libre_Baskerville({
+  variable: "--font-libre-baskerville",  subsets: ["latin"],
+  weight: ["400", "700"],
 });
-const openSans = Open_Sans({
-  variable: "--font-open-sans",
-  subsets: ["latin"],
+const inter = Inter({
+  variable: "--font-inter",  subsets: ["latin"],
 });

 export default function RootLayout({
@@ -38,7 +39,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${inter.variable} ${openSans.variable} antialiased`}>
+        <body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -16,15 +16,15 @@ export default function LandingPage() {
  return (
    <ThemeProvider
        defaultButtonVariant="shift-hover"
-        defaultTextAnimation="background-highlight"
-        borderRadius="rounded"
-        contentWidth="small"
-        sizing="mediumSizeLargeTitles"
-        background="circleGradient"
-        cardStyle="subtle-shadow"
-        primaryButtonStyle="shadow"
-        secondaryButtonStyle="radial-glow"
-        headingFontWeight="light"
+        defaultTextAnimation="reveal-blur"
+        borderRadius="pill"
+        contentWidth="mediumSmall"
+        sizing="mediumLargeSizeMediumTitles"
+        background="aurora"
+        cardStyle="glass-elevated"
+        primaryButtonStyle="diagonal-gradient"
+        secondaryButtonStyle="glass"
+        headingFontWeight="medium"
    >
      <ReactLenis root>
  <div id="nav" data-section="nav">
@@ -161,4 +161,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-open-sans), sans-serif;
+  font-family: var(--font-libre-baskerville), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-inter), sans-serif;
+  font-family: var(--font-libre-baskerville), sans-serif;
 }
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #ffffff;
-  --card: #f9f9f9;
-  --foreground: #000612e6;
-  --primary-cta: #15479c;
+  --background: #f7f6f7;
+  --card: #ffffff;
+  --foreground: #1b0c25;
+  --primary-cta: #1b0c25;
  --primary-cta-text: #ffffff;
-  --secondary-cta: #f9f9f9;
+  --secondary-cta: #ffffff;
  --secondary-cta-text: #000612e6;
-  --accent: #e2e2e2;
-  --background-accent: #c4c4c4;
+  --accent: #ff93e4;
+  --background-accent: #e8a8c3;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);