development/0ba5cd34-43ee-4aab-bd91-62a798ee5cb1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main

Browse Source 
Merge version_2 into main
This commit was merged in pull request #1.
This commit is contained in:
development
2025-12-22 10:58:27 +00:00
parent 006ac33f80 fc3cd3594a
commit 9fcebf3e6c
3 changed files with 14 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 */
/* --vw is set by ThemeProvider */
--background: #f1f7f9;;
--card: #ebf2f5;;
--foreground: #404548;;
--primary-cta: #a0c4d4;;
--secondary-cta: #ffffff;;
--accent: #c8dce8;;
--background-accent: #8fb0c4;;
--background: #ffffff;
--card: #fafafa;
--foreground: #000000;
--primary-cta: #ffcc00;
--secondary-cta: #ffffff;
--accent: #000000;
--background-accent: #f5f5f5;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -495,7 +495,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-playfair-display), sans-serif;
font-family: var(--font-inter-tight), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-playfair-display), sans-serif;
font-family: var(--font-inter-tight), sans-serif;
}

8
src/app/layout.tsx
View File

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

2
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import HeroLogoBillboardSplitImage from '@/components/sections/hero/HeroLogoBillboardSplitImage';