Merge version_3 into main #21

Merged
bender merged 4 commits from version_3 into main 2026-02-20 07:42:42 +00:00
4 changed files with 8 additions and 28 deletions

View File

@@ -28,7 +28,6 @@ export default function BlogPage() {
<NavbarStyleFullscreen
brandName="CapitalFlow"
navItems={[
{ name: "Home", id: "/" },
{ name: "Platform", id: "features" },
{ name: "Pricing", id: "pricing" },
{ name: "About", id: "about" },

View File

@@ -4,8 +4,6 @@ import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Work_Sans } from "next/font/google";
import { Source_Sans_3 } from "next/font/google";
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville", subsets: ["latin"],
@@ -25,15 +23,6 @@ export const metadata: Metadata = {
}
};
const workSans = Work_Sans({
variable: "--font-work-sans",
subsets: ["latin"],
});
const sourceSans3 = Source_Sans_3({
variable: "--font-source-sans-3",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -42,7 +31,9 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${workSans.variable} ${sourceSans3.variable} antialiased`}>
<body
className={`${libreBaskerville.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}

View File

@@ -85,13 +85,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleFullscreen
brandName="CapitalFlow"
navItems={[
{ name: "Home", id: "/" },
{ name: "Platform", id: "features" },
{ name: "Pricing", id: "pricing" },
{ name: "About", id: "about" },
{ name: "Blog", id: "blog" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
bottomLeftText="Global Tech Investors"
bottomRightText="hello@capitalflow.io"
@@ -125,13 +123,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleFullscreen
brandName="CapitalFlow"
navItems={[
{ name: "Home", id: "/" },
{ name: "Platform", id: "features" },
{ name: "Pricing", id: "pricing" },
{ name: "About", id: "about" },
{ name: "Blog", id: "blog" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
bottomLeftText="Global Tech Investors"
bottomRightText="hello@capitalflow.io"
@@ -172,13 +168,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleFullscreen
brandName="CapitalFlow"
navItems={[
{ name: "Home", id: "/" },
{ name: "Platform", id: "features" },
{ name: "Pricing", id: "pricing" },
{ name: "About", id: "about" },
{ name: "Blog", id: "blog" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
bottomLeftText="Global Tech Investors"
bottomRightText="hello@capitalflow.io"

View File

@@ -35,13 +35,11 @@ export default function ShopPage() {
<NavbarStyleFullscreen
brandName="CapitalFlow"
navItems={[
{ name: "Home", id: "/" },
{ name: "Platform", id: "features" },
{ name: "Pricing", id: "pricing" },
{ name: "About", id: "about" },
{ name: "Blog", id: "blog" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
bottomLeftText="Global Tech Investors"
bottomRightText="hello@capitalflow.io"
@@ -73,13 +71,11 @@ export default function ShopPage() {
<NavbarStyleFullscreen
brandName="CapitalFlow"
navItems={[
{ name: "Home", id: "/" },
{ name: "Platform", id: "features" },
{ name: "Pricing", id: "pricing" },
{ name: "About", id: "about" },
{ name: "Blog", id: "blog" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
bottomLeftText="Global Tech Investors"
bottomRightText="hello@capitalflow.io"