Merge version_5 into main #14

Merged
bender merged 2 commits from version_5 into main 2026-03-05 23:04:50 +00:00
2 changed files with 8 additions and 12 deletions

View File

@@ -1,15 +1,13 @@
import type { Metadata } from "next";
import { Manrope } from "next/font/google";
import "./styles/variables.css";
import { Inter } from "next/font/google";
import "./globals.css";
import "./styles/variables.css";
import "./styles/base.css";
const manrope = Manrope({
variable: "--font-manrope", subsets: ["latin"],
});
const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
title: "Taishan Construction | Premium Hardscape & Building Services Toronto", description: "Premium interlock driveways, patios, landscaping & construction services across the GTA. Free 3D design, expert installation, luxury results."
};
title: "Taishan Construction", description: "Premium landscaping and construction services for Toronto and the GTA"};
export default function RootLayout({
children,
@@ -18,9 +16,7 @@ export default function RootLayout({
}) {
return (
<html lang="en">
<body className={`${manrope.variable} antialiased`}>
{children}
<body className={inter.className}>{children}
<script
dangerouslySetInnerHTML={{
__html: `

View File

@@ -2,7 +2,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import HeroBillboardCarousel from '@/components/sections/hero/HeroBillboardCarousel';
import HeroBillboardScroll from '@/components/sections/hero/HeroBillboardScroll';
import SplitAbout from '@/components/sections/about/SplitAbout';
import FeatureHoverPattern from '@/components/sections/feature/featureHoverPattern/FeatureHoverPattern';
import MetricCardTen from '@/components/sections/metrics/MetricCardTen';
@@ -115,7 +115,7 @@ export default function LandingPage() {
</div>
<div id="hero" data-section="hero" className="pt-20">
<HeroBillboardCarousel
<HeroBillboardScroll
title="Toronto's Trusted Interlock & Construction Specialists"
description="Premium landscaping and construction services across the GTA. Designed with precision. Built to last."
tag="Luxury Construction"