Merge version_2 into main #1

Merged
bender merged 4 commits from version_2 into main 2026-02-11 05:48:59 +00:00
4 changed files with 20 additions and 19 deletions

View File

@@ -54,7 +54,8 @@ export default function BlogPage() {
const url = `${apiUrl}/posts/${projectId}?status=published`;
const response = await fetch(url, {
method: "GET", headers: {
"Content-Type": "application/json"},
"Content-Type": "application/json"
},
});
if (response.ok) {
@@ -158,4 +159,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -4,21 +4,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #e3deea;;
--card: #ffffff;;
--foreground: #27231f;;
--primary-cta: #c68a62;;
--secondary-cta: #ffffff;;
--accent: #c68a62;;
--background-accent: #c68a62;; */
/* --background: #ffffff;;
--card: #f9f9f9;;
--foreground: #000612e6;;
--primary-cta: #15479c;;
--secondary-cta: #f9f9f9;;
--accent: #e2e2e2;;
--background-accent: #c4c4c4;; */
--background: #e3deea;;
--card: #ffffff;;
--foreground: #27231f;;
--primary-cta: #c68a62;;
--secondary-cta: #ffffff;;
--accent: #c68a62;;
--background-accent: #c68a62;;
--background: #ffffff;;
--card: #f9f9f9;;
--foreground: #000612e6;;
--primary-cta: #15479c;;
--secondary-cta: #f9f9f9;;
--accent: #e2e2e2;;
--background-accent: #c4c4c4;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);

View File

@@ -1264,4 +1264,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
@@ -239,4 +239,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}