development/624c93cd-d8fd-4efd-a099-9e460889ed1e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

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

5 Commits
version_1 ... main

Author SHA1 Message Date
development
e945a556bc Merge version_2 into main 
Merge version_2 into main
 2026-01-20 10:30:31 +00:00
development
7f8225f777 Update src/app/page.tsx 2026-01-20 10:30:27 +00:00
development
fc9de42ecb Update src/app/layout.tsx 2026-01-20 10:30:26 +00:00
development
40a23e2ea8 Update src/app/globals.css 2026-01-20 10:30:25 +00:00
development
57e821f67f Merge version_1 into main 
Merge version_1 into main
 2026-01-20 10:01:32 +00:00
3 changed files with 29 additions and 28 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: #fbfaff;; /* --background: #ffffff;;
--card: #f7f5ff;; --card: #f9f9f9;;
--foreground: #0f0022;; --foreground: #000000;;
--primary-cta: #8b5cf6;; --primary-cta: #000000;;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;;
--accent: #d8cef5;; --accent: #e2e2e2;;
--background-accent: #c4a8f9;; */ --background-accent: #c4c4c4;; */
--background: #fbfaff;; --background: #ffffff;;
--card: #f7f5ff;; --card: #f9f9f9;;
--foreground: #0f0022;; --foreground: #000000;;
--primary-cta: #8b5cf6;; --primary-cta: #000000;;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;;
--accent: #d8cef5;; --accent: #e2e2e2;;
--background-accent: #c4a8f9;; --background-accent: #c4c4c4;;
/* 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);
@@ -509,7 +509,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-space-grotesk), sans-serif; font-family: var(--font-inter), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -522,5 +522,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-space-grotesk), sans-serif; font-family: var(--font-inter), sans-serif;
} }

10
src/app/layout.tsx
View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Space_Grotesk } from "next/font/google"; import { Inter } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
const spaceGrotesk = Space_Grotesk({ const inter = Inter({
variable: "--font-space-grotesk", subsets: ["latin"], variable: "--font-inter", subsets: ["latin"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -36,7 +36,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={spaceGrotesk.variable} className={inter.variable}
> >
<Tag /> <Tag />
{children} {children}
@@ -1262,4 +1262,4 @@ export default function RootLayout({
</ServiceWrapper> </ServiceWrapper>
</html> </html>
); );
} }

19
src/app/page.tsx
View File

@@ -1,7 +1,7 @@
"use client"; "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleMinimal from '@/components/navbar/NavbarStyleMinimal'; import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import HeroBillboardScroll from '@/components/sections/hero/HeroBillboardScroll'; import HeroBillboardScroll from '@/components/sections/hero/HeroBillboardScroll';
import MediaAbout from '@/components/sections/about/MediaAbout'; import MediaAbout from '@/components/sections/about/MediaAbout';
import FeatureCardEight from '@/components/sections/feature/FeatureCardEight'; import FeatureCardEight from '@/components/sections/feature/FeatureCardEight';
@@ -26,14 +26,15 @@ export default function NeuroLinkPage() {
headingFontWeight="light" headingFontWeight="light"
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
<NavbarStyleMinimal <NavbarStyleApple
brandName="NeuroLink" brandName="NeuroLink"
button={{ navItems={[
text: "Learn More", href: "#about" { name: "About", id: "about" },
}} { name: "Features", id: "features" },
className="border-b border-accent/10" { name: "Metrics", id: "metrics" },
buttonClassName="bg-primary-cta hover:bg-primary-cta/90" { name: "Technology", id: "technology" },
buttonTextClassName="text-secondary-cta font-medium" { name: "Contact", id: "contact" }
]}
/> />
</div> </div>
@@ -202,4 +203,4 @@ export default function NeuroLinkPage() {
</div> </div>
</ThemeProvider> </ThemeProvider>
); );
} }