27 Commits

Author SHA1 Message Date
eb05bb99fd Merge version_8 into main
Merge version_8 into main
2025-12-28 14:23:24 +00:00
6b571e5497 Update src/app/page.tsx 2025-12-28 14:23:19 +00:00
c604dbbe29 Update src/app/layout.tsx 2025-12-28 14:23:18 +00:00
fcf41ae025 Update src/app/globals.css 2025-12-28 14:23:17 +00:00
802103b562 Merge version_7 into main
Merge version_7 into main
2025-12-28 03:26:16 +00:00
fafeb0ec7a Update src/app/page.tsx 2025-12-28 03:26:11 +00:00
90ca81fef4 Merge version_6 into main
Merge version_6 into main
2025-12-28 03:07:11 +00:00
bc91b47822 Update src/app/page.tsx 2025-12-28 03:07:07 +00:00
cab0df2390 Update src/app/layout.tsx 2025-12-28 03:07:06 +00:00
b1fb03bf44 Merge version_6 into main
Merge version_6 into main
2025-12-28 03:05:20 +00:00
4d2e33c122 Update src/app/page.tsx 2025-12-28 03:05:16 +00:00
38b5788f07 Update src/app/layout.tsx 2025-12-28 03:05:15 +00:00
81eb1f1a78 Merge version_5 into main
Merge version_5 into main
2025-12-28 03:03:05 +00:00
9620d9d66a Update src/app/page.tsx 2025-12-28 03:03:01 +00:00
6db37304a7 Merge version_5 into main
Merge version_5 into main
2025-12-28 03:01:50 +00:00
05d820609a Update src/app/page.tsx 2025-12-28 03:01:45 +00:00
7f604e9169 Merge version_5 into main
Merge version_5 into main
2025-12-28 03:00:21 +00:00
c86fb4ef82 Update src/app/page.tsx 2025-12-28 03:00:17 +00:00
4636f764b0 Update src/app/layout.tsx 2025-12-28 03:00:16 +00:00
f1eae01368 Merge version_4 into main
Merge version_4 into main
2025-12-28 02:47:59 +00:00
81b2de936c Update src/app/globals.css 2025-12-28 02:47:55 +00:00
480a43b49f Merge version_3 into main
Merge version_3 into main
2025-12-28 02:40:01 +00:00
b334a30866 Update src/app/page.tsx 2025-12-28 02:39:56 +00:00
05a8697997 Update src/app/layout.tsx 2025-12-28 02:39:55 +00:00
700bf7e104 Update src/app/globals.css 2025-12-28 02:39:54 +00:00
ffaf0eaaeb Merge version_2 into main
Merge version_2 into main
2025-12-28 02:31:15 +00:00
fc87cd5833 Update src/app/page.tsx 2025-12-28 02:31:10 +00:00
3 changed files with 21 additions and 17 deletions

View File

@@ -4,13 +4,13 @@
/* Base units */
/* --vw is set by ThemeProvider */
--background: #fafafa;;
--card: #f4f4f5;;
--foreground: #27272a;;
--primary-cta: #3f3f46;;
--secondary-cta: #ffffff;;
--accent: #facc15;;
--background-accent: #eab308;;
--background: #0a0a0a;
--card: #1a1a1a;
--foreground: #fffffae6;
--primary-cta: #fde047;
--secondary-cta: #1a1a1a;
--accent: #737373;
--background-accent: #737373;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -495,7 +495,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-inter-tight), sans-serif;
font-family: var(--font-ibm-plex-sans), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-inter-tight), sans-serif;
font-family: var(--font-ibm-plex-sans), sans-serif;
}

View File

@@ -1,13 +1,13 @@
import type { Metadata } from "next";
import { Inter_Tight } from "next/font/google";
import { IBM_Plex_Sans } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const interTight = Inter_Tight({
variable: "--font-inter-tight",
const ibmPlexSans = IBM_Plex_Sans({
variable: "--font-ibm-plex-sans",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
weight: ["100", "200", "300", "400", "500", "600", "700"],
});
export const metadata: Metadata = {
@@ -47,7 +47,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${interTight.variable} antialiased`}
className={`${ibmPlexSans.variable} antialiased`}
>
<Tag />
{children}
@@ -1273,4 +1273,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleMinimal from '@/components/navbar/NavbarStyleMinimal';
@@ -63,6 +63,10 @@ export default function LandingPage() {
{
text: "View Portfolio",
href: "#gallery"
},
{
text: "Learn More",
href: "#about"
}
]}
/>
@@ -202,4 +206,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}