bender/e01a5824-473d-4c4d-98d3-edd0dd69aed6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_6 into main #17

Merged
bender merged 2 commits from version_6 into main 2026-03-06 00:00:38 +00:00
Conversation 0 Commits 2 Files Changed 2 +6 -12
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/layout.tsx
View File

@@ -1,24 +1,16 @@
import type { Metadata } from "next";
import { Manrope } from "next/font/google";
import { Inter } from "next/font/google";
import { Open_Sans } from "next/font/google";
import "./styles/variables.css";
import "./globals.css";
const manrope = Manrope({
variable: "--font-manrope", 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."
};
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: {
@@ -26,7 +18,7 @@ export default function RootLayout({
}) {
return (
<html lang="en">
<body className={`${inter.variable} ${openSans.variable} antialiased`}>
<body className={`${manrope.variable} antialiased`}>
{children}
<script

2
src/app/page.tsx
View File

@@ -12,6 +12,7 @@ import ContactFaq from '@/components/sections/contact/ContactFaq';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import { Building2, Eye, CheckCircle2, Palette, Users, MessageCircle, Sparkles, ArrowRightLeft, Cog, Footprints, Home, Zap, Shield, Hammer, Trees, Droplet, Frame, Lightbulb, Crown, Phone } from 'lucide-react';
import React, { useState } from 'react';
import Image from 'next/image';
interface BeforeAfterImagePair {
beforeSrc: string;
@@ -102,6 +103,7 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Taishan"
brandLogo="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AXh5KliD4l7rWjrQZkOq7ZuPnH/uploaded-1772755165036-dookr298.png"
navItems={[
{ name: "Services", id: "services" },
{ name: "Gallery", id: "gallery" },