bender/3fe4f0db-d9e6-4c32-9cbe-257165332cb6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #4

Merged
bender merged 4 commits from version_2 into main 2026-03-04 06:48:58 +00:00
Conversation 0 Commits 4 Files Changed 4 +28 -48
4 changed files with 28 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/app/layout.tsx
View File

@@ -1,42 +1,23 @@
import type { Metadata } from "next";
import { Nunito_Sans } from "next/font/google";
import { SF_Pro_Display } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const nunitoSans = Nunito_Sans({
variable: "--font-nunito-sans",
subsets: ["latin"],
const sfProDisplay = SF_Pro_Display({
variable: "--font-sf-pro-display", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
export const metadata: Metadata = {
title: "M&T Kelly Electrical - Geelong's Trusted Local Electrician",
description: "Owner-operated electrical services in Geelong. Residential, commercial, solar & emergency solutions. Free quotes, insured & registered.",
keywords: "electrician, Geelong, electrical services, solar, rewiring, switchboards, emergency",
openGraph: {
title: "M&T Kelly Electrical - Geelong Electrician",
description: "Professional electrical services for homes and businesses in Geelong. Domestic & commercial wiring specialist.",
siteName: "M&T Kelly Electrical",
type: "website",
},
robots: {
index: true,
follow: true,
},
};
title: "M&T Kelly - Geelong Electrical Services", description: "Professional electrical services in Geelong. Residential, commercial, solar, and emergency solutions."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${nunitoSans.variable} antialiased`}>
<Tag />
{children}
<html lang="en">
<body className={`${sfProDisplay.variable}`}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1404,7 +1385,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}
}

4
src/app/page.tsx
View File

@@ -117,7 +117,7 @@ export default function HomePage() {
<div id="hero" data-section="hero">
<HeroCarouselLogo
logoText="M&T KELLY"
logoText="M&T Kelly"
description="Geelong's Trusted Local Electrician. Domestic & Commercial Wiring Specialists"
buttons={[
{ text: "Call 0418 527 497", href: "tel:0418527497" },
@@ -203,4 +203,4 @@ export default function HomePage() {
</div>
</ThemeProvider>
);
}
}

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

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

28
src/app/styles/variables.css
View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #e3deea;;
--card: #ffffff;;
--foreground: #27231f;;
--primary-cta: #27231f;;
--secondary-cta: #ffffff;;
--accent: #c68a62;;
--background-accent: #c68a62;; */
/* --background: #ffffff;;
--card: #f5f5f5;;
--foreground: #1a1a1a;;
--primary-cta: #000000;;
--secondary-cta: #f5f5f5;;
--accent: #e5e5e5;;
--background-accent: #d0d0d0;; */
--background: #e3deea;;
--card: #ffffff;;
--foreground: #27231f;;
--primary-cta: #27231f;;
--background: #ffffff;;
--card: #f5f5f5;;
--foreground: #1a1a1a;;
--primary-cta: #000000;;
--primary-cta-text: #e3deea;;
--secondary-cta: #ffffff;;
--secondary-cta: #f5f5f5;;
--secondary-cta-text: #27231f;;
--accent: #c68a62;;
--background-accent: #c68a62;;
--accent: #e5e5e5;;
--background-accent: #d0d0d0;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);