Merge version_3 into main #6

Merged
bender merged 2 commits from version_3 into main 2026-03-03 13:46:14 +00:00
2 changed files with 13 additions and 11 deletions

View File

@@ -1,16 +1,16 @@
import type { Metadata } from "next";
import { Public_Sans } from "next/font/google";
import { Montserrat } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Manrope } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const publicSans = Public_Sans({
variable: "--font-public-sans", subsets: ["latin"],
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
});
const montserrat = Montserrat({
variable: "--font-montserrat", subsets: ["latin"],
const manrope = Manrope({
variable: "--font-manrope", subsets: ["latin"],
});
export const metadata: Metadata = {
@@ -19,9 +19,11 @@ export const metadata: Metadata = {
follow: true,
},
openGraph: {
title: "Professional Business Consulting", description: "Enterprise-grade business consulting and strategic planning services", type: "website", siteName: "Business Consulting"},
title: "Professional Business Consulting", description: "Enterprise-grade business consulting and strategic planning services", type: "website", siteName: "Business Consulting"
},
twitter: {
card: "summary_large_image", title: "Professional Business Consulting", description: "Enterprise-grade business consulting and strategic planning services"},
card: "summary_large_image", title: "Professional Business Consulting", description: "Enterprise-grade business consulting and strategic planning services"
},
};
export default function RootLayout({
@@ -33,7 +35,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${publicSans.variable} ${montserrat.variable} antialiased`}
className={`${dmSans.variable} ${manrope.variable} antialiased`}
>
<Tag />
{children}

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-public-sans), sans-serif;
font-family: var(--font-dm-sans), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-public-sans), sans-serif;
font-family: var(--font-manrope), sans-serif;
}