bender/6c42185c-0dd2-47b1-ba67-83700f2e51db
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_2
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_3
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1

3 Commits
version_2 ... version_3

Author SHA1 Message Date
bender
8fc1fb2481 Update src/app/styles/base.css 2026-03-03 13:46:09 +00:00
bender
f16325e408 Update src/app/layout.tsx 2026-03-03 13:46:09 +00:00
bender
c651a384ca Merge version_2 into main 
Merge version_2 into main
 2026-03-03 13:32:24 +00:00
2 changed files with 13 additions and 11 deletions
Expand all files Collapse all files

20
src/app/layout.tsx
View File

@@ -1,16 +1,16 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Public_Sans } from "next/font/google"; import { DM_Sans } from "next/font/google";
import { Montserrat } from "next/font/google"; import { Manrope } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
const publicSans = Public_Sans({ const dmSans = DM_Sans({
variable: "--font-public-sans", subsets: ["latin"], variable: "--font-dm-sans", subsets: ["latin"],
}); });
const montserrat = Montserrat({ const manrope = Manrope({
variable: "--font-montserrat", subsets: ["latin"], variable: "--font-manrope", subsets: ["latin"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -19,9 +19,11 @@ export const metadata: Metadata = {
follow: true, follow: true,
}, },
openGraph: { 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: { 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({ export default function RootLayout({
@@ -33,7 +35,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${publicSans.variable} ${montserrat.variable} antialiased`} className={`${dmSans.variable} ${manrope.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}

4
src/app/styles/base.css
View File

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