development/f32d451c-7887-41ee-9ff2-d1656700672a
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:37:47 +00:00
parent dd07e74e4e 9e3b6cddf4
commit 351109b757
3 changed files with 19 additions and 18 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: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #f0f5fce6;;
--primary-cta: #3891f6;;
--secondary-cta: #1a1a1a;;
--accent: #80bfff;;
--background-accent: #016ad3;;
--background: #000f06;
--card: #0d1d0d;
--foreground: #e6ffe6;
--primary-cta: #1cde5d;
--secondary-cta: #0a1f0f;
--accent: #5dd882;
--background-accent: #0d6b32;
/* 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-fraunces), sans-serif;
font-family: var(--font-poppins), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-fraunces), sans-serif;
font-family: var(--font-poppins), sans-serif;
}

11
src/app/layout.tsx
View File

@@ -1,12 +1,13 @@
import type { Metadata } from "next";
import { Fraunces } from "next/font/google";
import { Poppins } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const fraunces = Fraunces({
variable: "--font-fraunces",
const poppins = Poppins({
variable: "--font-poppins",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export const metadata: Metadata = {
@@ -49,7 +50,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={fraunces.variable}
className={poppins.variable}
>
<Tag />
{children}
@@ -1275,4 +1276,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

8
src/app/page.tsx
View File

@@ -1,7 +1,7 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import HeroLogoCarousel from '@/components/sections/hero/HeroLogoCarousel';
import ProductCardFour from '@/components/sections/product/ProductCardFour';
import FeatureCardTwenty from '@/components/sections/feature/FeatureCardTwenty';
@@ -26,7 +26,7 @@ export default function LandingPage() {
headingFontWeight="semibold"
>
<div id="nav" data-section="nav">
<NavbarStyleCentered
<NavbarLayoutFloatingOverlay
brandName="OddsVault"
navItems={[
{ name: "Home", id: "hero" },
@@ -275,4 +275,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}