Merge version_4 into main

Merge version_4 into main

src/app/page.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import HeroBillboard from '@/components/sections/hero/HeroBillboard';
 import TextAbout from '@/components/sections/about/TextAbout';
 import FeatureCardSeven from '@/components/sections/feature/FeatureCardSeven';
@@ -49,8 +49,14 @@ export default function HomePage() {
       headingFontWeight="semibold"
     >
       <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingOverlay
-          navItems={navItems}
+        <NavbarLayoutFloatingInline
+          navItems={[
+            { name: "Home", id: "#home" },
+            { name: "About", id: "#about" },
+            { name: "Events", id: "#events" },
+            { name: "Members", id: "#members" },
+            { name: "Contact", id: "#contact" }
+          ]}
           brandName="Computer Club"
           button={{ text: "Join Us", href: "/contact" }}
         />

src/app/styles/base.css

@@ -11,7 +11,7 @@ html {
 body {
   background-color: var(--background);
   color: var(--foreground);
-  font-family: var(--font-font-family: var(--font-open-sans), sans-serif;), sans-serif;
+  font-family: var(--font-inter), sans-serif;), sans-serif;
   position: relative;
   min-height: 100vh;
   overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-font-family: var(--font-open-sans), sans-serif;), sans-serif;
+  font-family: var(--font-public-sans), sans-serif;), sans-serif;
 }

src/app/styles/variables.css

@@ -3,22 +3,22 @@
   /* --vw is set by ThemeProvider */
 
   /* --background: #ffffff;;
-  --card: #f9f9f9;;
-  --foreground: #000f06e6;;
-  --primary-cta: #0a7039;;
-  --secondary-cta: #f9f9f9;;
-  --accent: #e2e2e2;;
-  --background-accent: #c4c4c4;; */
+  --card: #f5f5f5;;
+  --foreground: #1a1a1a;;
+  --primary-cta: #0066cc;;
+  --secondary-cta: #ffffff;;
+  --accent: #cccccc;;
+  --background-accent: #e6e6e6;; */
 
   --background: #ffffff;;
-  --card: #f9f9f9;;
-  --foreground: #000f06e6;;
-  --primary-cta: #0a7039;;
+  --card: #f5f5f5;;
+  --foreground: #1a1a1a;;
+  --primary-cta: #0066cc;;
   --primary-cta-text: #ffffff;;
-  --secondary-cta: #f9f9f9;;
+  --secondary-cta: #ffffff;;
   --secondary-cta-text: #000f06e6;;
-  --accent: #e2e2e2;;
-  --background-accent: #c4c4c4;;
+  --accent: #cccccc;;
+  --background-accent: #e6e6e6;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);