development/b43e5a35-78df-4afe-95e9-9250ce4be414
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-28 20:35:03 +00:00
Conversation 0 Commits 2 Files Changed 2 +15 -15
2 changed files with 15 additions and 15 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 */
/* --vw is set by ThemeProvider */
/* --background: #f6f0e9;;
--card: #efe7dd;;
--foreground: #2b180a;;
--primary-cta: #2b180a;;
--secondary-cta: #efe7dd;;
--accent: #94877c;;
--background-accent: #afa094;; */
/* --background: #010912;;
--card: #152840;;
--foreground: #e6f0ff;;
--primary-cta: #cee7ff;;
--secondary-cta: #0e1a29;;
--accent: #3f5c79;;
--background-accent: #004a93;; */
--background: #f6f0e9;;
--card: #efe7dd;;
--foreground: #2b180a;;
--primary-cta: #2b180a;;
--secondary-cta: #efe7dd;;
--accent: #94877c;;
--background-accent: #afa094;;
--background: #010912;;
--card: #152840;;
--foreground: #e6f0ff;;
--primary-cta: #cee7ff;;
--secondary-cta: #0e1a29;;
--accent: #3f5c79;;
--background-accent: #004a93;;
/* 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 NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';