development/198267bc-cdf6-43b3-8dbd-912a6bdfa5bc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: development:version_2
Branches Tags
development:main development:version_3 development:version_2 development:version_1
...
pull from: development:main
Branches Tags
development:main development:version_3 development:version_2 development:version_1

4 Commits
version_2 ... main

Author SHA1 Message Date
development
41eb7979e3 Merge version_3 into main 
Merge version_3 into main
 2026-01-17 00:14:14 +00:00
development
430fd3fa47 Update src/app/page.tsx 2026-01-17 00:14:09 +00:00
development
6ea845b55e Update src/app/globals.css 2026-01-17 00:14:08 +00:00
development
16276e14f9 Merge version_2 into main 
Merge version_2 into main
 2026-01-17 00:10:17 +00:00
2 changed files with 15 additions and 15 deletions
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: #fff5f5;; /* --background: #fef5f5;;
--card: #ffe6f0;; --card: #fde6f2;;
--foreground: #ff1493;; --foreground: #c8227a;;
--primary-cta: #ff3366;; --primary-cta: #d9394f;;
--secondary-cta: #ffff00;; --secondary-cta: #e8d65a;;
--accent: #00ffff;; --accent: #00d4d4;;
--background-accent: #ff69b4;; */ --background-accent: #e8a3c8;; */
--background: #fff5f5;; --background: #fef5f5;;
--card: #ffe6f0;; --card: #fde6f2;;
--foreground: #ff1493;; --foreground: #c8227a;;
--primary-cta: #ff3366;; --primary-cta: #d9394f;;
--secondary-cta: #ffff00;; --secondary-cta: #e8d65a;;
--accent: #00ffff;; --accent: #00d4d4;;
--background-accent: #ff69b4;; --background-accent: #e8a3c8;;
/* 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);

2
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 NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen'; import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';