bender/e4c5bd8b-285f-4d9a-906f-40504ecd1be4
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_3 bender:version_2 bender:version_1
...
pull from: bender:version_2
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1

6 Commits
version_1 ... version_2

Author SHA1 Message Date
bender
d6fdc658b0 Update src/app/page.tsx 2026-03-04 04:08:59 +00:00
bender
8e57e378c9 Update src/app/styles/variables.css 2026-03-04 04:07:27 +00:00
bender
ff2ffd34c7 Update src/app/styles/base.css 2026-03-04 04:07:26 +00:00
bender
21ad741833 Update src/app/page.tsx 2026-03-04 04:07:25 +00:00
bender
e3e02b8f7d Update src/app/layout.tsx 2026-03-04 04:07:25 +00:00
bender
c4c21b72dc Merge version_1 into main 
Merge version_1 into main
 2026-03-04 03:56:40 +00:00
4 changed files with 21 additions and 27 deletions
Expand all files Collapse all files

14
src/app/layout.tsx
View File

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

2
src/app/page.tsx
View File

@@ -1,6 +1,6 @@
"use client"; "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 { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered"; import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
import HeroSplitTestimonial from "@/components/sections/hero/HeroSplitTestimonial"; import HeroSplitTestimonial from "@/components/sections/hero/HeroSplitTestimonial";

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-nunito), sans-serif; font-family: var(--font-inter), 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-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 */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #F5F5F5;; /* --background: #0f0f0f;;
--card: #FFFFFF;; --card: #1a1a1a;;
--foreground: #333333;; --foreground: #ffffff;;
--primary-cta: #191970;; --primary-cta: #e63946;;
--secondary-cta: #007BFF;; --secondary-cta: #2a2a2a;;
--accent: #E50914;; --accent: #e63946;;
--background-accent: #191970;; */ --background-accent: #e63946;; */
--background: #F5F5F5;; --background: #0f0f0f;;
--card: #FFFFFF;; --card: #1a1a1a;;
--foreground: #333333;; --foreground: #ffffff;;
--primary-cta: #191970;; --primary-cta: #e63946;;
--primary-cta-text: #FFFFFF;; --primary-cta-text: #FFFFFF;;
--secondary-cta: #007BFF;; --secondary-cta: #2a2a2a;;
--secondary-cta-text: #FFFFFF;; --secondary-cta-text: #FFFFFF;;
--accent: #E50914;; --accent: #e63946;;
--background-accent: #191970;; --background-accent: #e63946;;
/* 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);