Merge version_2 into main #4

Merged
bender merged 7 commits from version_2 into main 2026-03-05 08:00:22 +00:00
7 changed files with 14 additions and 61 deletions

View File

@@ -127,4 +127,4 @@ export default function BlogPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -131,4 +131,4 @@ export default function ContactPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -1,68 +1,22 @@
import type { Metadata } from "next";
import { Montserrat } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Patent & Intellectual Property Protection | PatentPro",
description: "Expert patent registration, trademark protection, and copyright services for businesses and innovators. Trusted IP consulting firm protecting your valuable assets.",
keywords: "patent registration, trademark protection, copyright, intellectual property, IP law, patent attorney, trademark attorney",
metadataBase: new URL("https://patentpro.com"),
alternates: {
canonical: "https://patentpro.com",
},
openGraph: {
title: "Protect Your Intellectual Property | PatentPro",
description: "Expert patent, trademark, and copyright protection for innovators and businesses. Trusted by industry leaders.",
siteName: "PatentPro",
type: "website",
images: [
{
url: "http://img.b2bpic.net/free-photo/focused-boss-analyzing-managers-report-reading-reviewing-papers-while-sitting-workplace-business-communication-concept_74855-11702.jpg",
alt: "Patent and IP Protection Services",
},
],
},
twitter: {
card: "summary_large_image",
title: "Protect Your Intellectual Property | PatentPro",
description: "Expert patent, trademark, and copyright protection for innovators and businesses.",
images: [
"http://img.b2bpic.net/free-photo/focused-boss-analyzing-managers-report-reading-reviewing-papers-while-sitting-workplace-business-communication-concept_74855-11702.jpg",
],
},
robots: {
index: true,
follow: true,
},
};
title: "PatentPro - Intellectual Property Protection", description: "Expert patent, trademark, and copyright protection for innovators and businesses"};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${montserrat.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.variable}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1430,7 +1384,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}
}

View File

@@ -254,4 +254,4 @@ export default function HomePage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -147,4 +147,4 @@ export default function ResultsPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -149,4 +149,4 @@ export default function ServicesPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -13,12 +13,12 @@
--background: #ffffff;
--card: #f9f9f9;
--foreground: #120a00e6;
--primary-cta: #E34400;
--primary-cta: #1F3C66;
--primary-cta-text: #ffffff;
--secondary-cta: #f9f9f9;
--secondary-cta-text: #120a00e6;
--accent: #e2e2e2;
--background-accent: #E34400;
--background-accent: #1F3C66;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);