bender/e4c5bd8b-285f-4d9a-906f-40504ecd1be4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

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

14
src/app/layout.tsx
View File

@@ -1,18 +1,12 @@
import type { Metadata } from "next";
import { Nunito } from "next/font/google";
import { Halant } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const nunito = Nunito({
variable: "--font-nunito", subsets: ["latin"],
});
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
});
const inter = Inter({
@@ -49,7 +43,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${nunito.variable} ${halant.variable} ${inter.variable} antialiased`}
className={`${dmSans.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}

8
src/app/page.tsx
View File

@@ -1,6 +1,6 @@
"use client";
import { Award, CheckCircle, Sparkles, Zap } from "lucide-react";
import { Award, CheckCircle, Sparkles, Zap, Globe } from "lucide-react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
import HeroSplitTestimonial from "@/components/sections/hero/HeroSplitTestimonial";
@@ -37,6 +37,12 @@ export default function LandingPage() {
{ name: "Contact", id: "contact" }
]}
button={{ text: "Book Event", href: "contact" }}
languageSelector={[
{ label: "EN", code: "en" },
{ label: "ES", code: "es" },
{ label: "FR", code: "fr" },
{ label: "DE", code: "de" }
]}
/>
</div>

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-nunito), sans-serif;
font-family: var(--font-inter), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-nunito), sans-serif;
font-family: var(--font-dm-sans), sans-serif;
}

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

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #F5F5F5;;
--card: #FFFFFF;;
--foreground: #333333;;
--primary-cta: #191970;;
--secondary-cta: #007BFF;;
--accent: #E50914;;
--background-accent: #191970;; */
/* --background: #0f0f0f;;
--card: #1a1a1a;;
--foreground: #ffffff;;
--primary-cta: #e63946;;
--secondary-cta: #2a2a2a;;
--accent: #e63946;;
--background-accent: #e63946;; */
--background: #F5F5F5;;
--card: #FFFFFF;;
--foreground: #333333;;
--primary-cta: #191970;;
--background: #0f0f0f;;
--card: #1a1a1a;;
--foreground: #ffffff;;
--primary-cta: #e63946;;
--primary-cta-text: #FFFFFF;;
--secondary-cta: #007BFF;;
--secondary-cta: #2a2a2a;;
--secondary-cta-text: #FFFFFF;;
--accent: #E50914;;
--background-accent: #191970;;
--accent: #e63946;;
--background-accent: #e63946;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);