Merge version_4 into main

Bob AI: change to Helvetic
2026-02-26 10:42:24 +00:00 · 2026-02-26 10:41:43 +00:00 · 2026-02-26 10:30:53 +00:00 · 2026-02-26 10:30:48 +00:00 · 2026-02-26 10:29:29 +00:00 · 2026-02-26 10:28:49 +00:00
4 changed files with 35 additions and 23 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,11 +1,8 @@
 import type { Metadata } from "next";
-import { Open_Sans } from "next/font/google";
+import { DM_Sans } from "next/font/google";
+import { Inter } from "next/font/google";
 import "./globals.css";

-const openSans = Open_Sans({
-  variable: "--font-open-sans",
-  subsets: ["latin"],
-});

 export const metadata: Metadata = {
  title: "Tech Club | Empowering Tech Enthusiasts Since 2018",
@@ -13,6 +10,15 @@ export const metadata: Metadata = {
  keywords: ["computer club", "tech enthusiasts", "coding club", "student technology", "tech community"],
 };

+const dmSans = DM_Sans({
+  variable: "--font-dm-sans",
+  subsets: ["latin"],
+});
+const inter = Inter({
+  variable: "--font-inter",
+  subsets: ["latin"],
+});
+
 export default function RootLayout({
  children,
 }: Readonly<{
@@ -20,7 +26,7 @@ export default function RootLayout({
 }>) {
  return (
    <html lang="en">
-      <body className={`${openSans.variable} antialiased`}>
+      <body className={`${dmSans.variable} ${inter.variable} antialiased`}>
        {children}
      
        <script
--- a/src/app/page.tsx
+++ b/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" }}
        />
--- a/src/app/styles/base.css
+++ b/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-dm-sans), sans-serif;), sans-serif;
 }
--- a/src/app/styles/variables.css
+++ b/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);
Author	SHA1	Message	Date
bender	8ac6faa3ea	Merge version_4 into main Merge version_4 into main	2026-02-26 10:42:24 +00:00
kudindmitriy	fbd0f6d63b	Bob AI: change to Helvetic	2026-02-26 10:41:43 +00:00
bender	d36cda4214	Merge version_3 into main Merge version_3 into main	2026-02-26 10:30:53 +00:00
kudindmitriy	8eff9cb749	Bob AI: change font to DM Sans + Inter	2026-02-26 10:30:48 +00:00
bender	cac9fb4e3a	Merge version_2 into main Merge version_2 into main	2026-02-26 10:29:29 +00:00
kudindmitriy	a6723dcd1c	Bob AI: i dont like this navbar, i want to see al links wi...	2026-02-26 10:28:49 +00:00
bender	851caeafce	Merge version_1 into main Merge version_1 into main	2026-02-26 10:27:06 +00:00