development/5ca799df-36e1-410e-b2a8-9c76ca75a71a
1
0
Fork 0
Code Issues Pull Requests 2 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 #3.
This commit is contained in:
development
2026-01-20 14:51:44 +00:00
parent c35644a13d 4af32de627
commit 06ad91a51e
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/globals.css
View File

@@ -4,21 +4,21 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #f5f5f5;; /* --background: #1a1a1a;;
--card: #ffffff;; --card: #2d2d2d;;
--foreground: #1c1c1c;; --foreground: #ffffff;;
--primary-cta: #e63946;; --primary-cta: #ff3d4a;;
--secondary-cta: #ffffff;; --secondary-cta: #1a1a1a;;
--accent: #e63946;; --accent: #ff3d4a;;
--background-accent: #e8a8b6;; */ --background-accent: #b8111f;; */
--background: #f5f5f5;; --background: #1a1a1a;;
--card: #ffffff;; --card: #2d2d2d;;
--foreground: #1c1c1c;; --foreground: #ffffff;;
--primary-cta: #e63946;; --primary-cta: #ff3d4a;;
--secondary-cta: #ffffff;; --secondary-cta: #1a1a1a;;
--accent: #e63946;; --accent: #ff3d4a;;
--background-accent: #e8a8b6;; --background-accent: #b8111f;;
/* 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);

4
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client" "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay'; import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -28,7 +28,7 @@ export default function LandingPage() {
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay <NavbarLayoutFloatingOverlay
brandName="Magnolia" brandedName="BogCoder"
navItems={[ navItems={[
{ name: "Home", id: "hero" }, { name: "Home", id: "hero" },
{ name: "About", id: "about" }, { name: "About", id: "about" },