development/c916d5da-fdf2-4018-b61d-d3baaf96d426
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #1

Merged
development merged 2 commits from version_2 into main 2026-01-21 11:04:56 +00:00
Conversation 0 Commits 2 Files Changed 2 +11 -11
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/globals.css
View File

@@ -4,21 +4,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
/* --background: #f7f6f7;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #341f51;;
--foreground: #251a0c;;
--primary-cta: #f4c408;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;; */
--accent: #f4ca26;;
--background-accent: #e8daa8;; */
--background: #f5f5f5;;
--background: #f7f6f7;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #341f51;;
--foreground: #251a0c;;
--primary-cta: #f4c408;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;;
--accent: #f4ca26;;
--background-accent: #e8daa8;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);

2
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';