Merge version_2 into main #1

Merged
development merged 4 commits from version_2 into main 2026-01-25 13:51:46 +00:00
4 changed files with 18 additions and 17 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) {
@@ -125,4 +126,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -4,21 +4,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1f514c;;
/* --background: #fef5f0;;
--card: #fde8dd;;
--foreground: #3d2817;;
--primary-cta: #d97c63;;
--secondary-cta: #ffffff;;
--accent: #159c49;;
--background-accent: #a8e8ba;; */
--accent: #f4a574;;
--background-accent: #e8a8a0;; */
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1f514c;;
--background: #fef5f0;;
--card: #fde8dd;;
--foreground: #3d2817;;
--primary-cta: #d97c63;;
--secondary-cta: #ffffff;;
--accent: #159c49;;
--background-accent: #a8e8ba;;
--accent: #f4a574;;
--background-accent: #e8a8a0;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);

View File

@@ -1257,4 +1257,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';
@@ -231,4 +231,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}