Merge version_2 into main

Merge version_2 into main

src/app/globals.css

@@ -4,21 +4,21 @@
   /* Base units */
   /* --vw is set by ThemeProvider */
 
-  /* --background: #f5f5f5;;
-  --card: #ffffff;;
-  --foreground: #1c1c1c;;
-  --primary-cta: #6139e6;;
+  /* --background: #fafffb;;
+  --card: #f7fffa;;
+  --foreground: #001a0a;;
+  --primary-cta: #0a7039;;
   --secondary-cta: #ffffff;;
-  --accent: #6139e6;;
-  --background-accent: #b3a8e8;; */
+  --accent: #a8d9be;;
+  --background-accent: #6bbf8e;; */
 
-  --background: #f5f5f5;;
-  --card: #ffffff;;
-  --foreground: #1c1c1c;;
-  --primary-cta: #6139e6;;
+  --background: #fafffb;;
+  --card: #f7fffa;;
+  --foreground: #001a0a;;
+  --primary-cta: #0a7039;;
   --secondary-cta: #ffffff;;
-  --accent: #6139e6;;
-  --background-accent: #b3a8e8;;
+  --accent: #a8d9be;;
+  --background-accent: #6bbf8e;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);

src/app/page.tsx

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