bender/126b0cf6-9ab2-4206-97db-57fe03038f1e
1
0
Fork 0
Code Issues Pull Requests 1 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

7 Commits
version_2 ... version_3

Author SHA1 Message Date
bender
c5c7d35161 Update src/app/page.tsx 2026-03-03 11:19:09 +00:00
bender
6ca68181b9 Update src/app/layout.tsx 2026-03-03 11:19:07 +00:00
bender
8c1f9a5679 Update src/app/styles/variables.css 2026-03-03 11:18:19 +00:00
bender
36a803d929 Update src/app/styles/base.css 2026-03-03 11:18:18 +00:00
bender
602eee08a4 Update src/app/page.tsx 2026-03-03 11:18:16 +00:00
bender
2e96a8c75e Update src/app/layout.tsx 2026-03-03 11:18:15 +00:00
bender
abdbc306f6 Merge version_2 into main 
Merge version_2 into main
 2026-03-03 10:51:30 +00:00
4 changed files with 18 additions and 18 deletions
Expand all files Collapse all files

8
src/app/layout.tsx
View File

@@ -1,12 +1,12 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Mulish } from "next/font/google"; import { Public_Sans } from "next/font/google";
import { Inter } from "next/font/google"; import { Inter } 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 mulish = Mulish({ const publicSans = Public_Sans({
variable: "--font-mulish", subsets: ["latin"], variable: "--font-public-sans", subsets: ["latin"],
}); });
const inter = Inter({ const inter = Inter({
@@ -33,7 +33,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${mulish.variable} ${inter.variable} antialiased`} className={`${publicSans.variable} ${inter.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}

12
src/app/page.tsx
View File

@@ -22,7 +22,7 @@ export default function LandingPage() {
cardStyle="gradient-bordered" cardStyle="gradient-bordered"
primaryButtonStyle="flat" primaryButtonStyle="flat"
secondaryButtonStyle="radial-glow" secondaryButtonStyle="radial-glow"
headingFontWeight="light" headingFontWeight="semibold"
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
<NavbarStyleCentered <NavbarStyleCentered
@@ -65,7 +65,7 @@ export default function LandingPage() {
<div id="about" data-section="about"> <div id="about" data-section="about">
<MetricSplitMediaAbout <MetricSplitMediaAbout
title="Your Local AC Expert in Chandni Chowk" title="Your Trusted AC Expert in Chandni Chowk"
description="Universal Sales Company has been serving Kolkata with premium air conditioning solutions for over 20 years. Located in the heart of Chandni Chowk, Bowbazar, we provide professional installation, repair, and maintenance services for residential and commercial properties. Our team of experienced technicians is committed to delivering reliable solutions and exceptional customer service." description="Universal Sales Company has been serving Kolkata with premium air conditioning solutions for over 20 years. Located in the heart of Chandni Chowk, Bowbazar, we provide professional installation, repair, and maintenance services for residential and commercial properties. Our team of experienced technicians is committed to delivering reliable solutions and exceptional customer service."
tag="About Us" tag="About Us"
metrics={[ metrics={[
@@ -82,8 +82,8 @@ export default function LandingPage() {
<div id="services" data-section="services"> <div id="services" data-section="services">
<FeatureCardSeven <FeatureCardSeven
title="Our Services" title="Our Professional Services"
description="Complete air conditioning solutions tailored to your needs. From sales to maintenance, we've got you covered." description="Complete air conditioning solutions tailored to your needs. From sales to maintenance, we've got you covered with professional expertise."
tag="Services" tag="Services"
features={[ features={[
{ {
@@ -167,8 +167,8 @@ export default function LandingPage() {
<div id="service-area" data-section="service-area"> <div id="service-area" data-section="service-area">
<ContactCTA <ContactCTA
tag="Service Area" tag="Service Area"
title="We Serve Kolkata & Surrounding Areas" title="Reliable Service Across Kolkata"
description="From Bowbazar to Chandni Chowk, Central Kolkata to North Kolkata - we bring AC solutions right to your doorstep. Fast, reliable service across the city." description="From Bowbazar to Chandni Chowk, Central Kolkata to North Kolkata - we bring professional AC solutions right to your doorstep. Fast, dependable service across the city."
buttons={[ buttons={[
{ text: "Check Serviceability", href: "#contact" }, { text: "Check Serviceability", href: "#contact" },
{ text: "Get in Touch", href: "#contact" }, { text: "Get in Touch", href: "#contact" },

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-inter), sans-serif; font-family: var(--font-public-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-mulish), sans-serif; font-family: var(--font-public-sans), sans-serif;
} }

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

@@ -5,20 +5,20 @@
/* --background: #f5f5f5;; /* --background: #f5f5f5;;
--card: #ffffff;; --card: #ffffff;;
--foreground: #1c1c1c;; --foreground: #1c1c1c;;
--primary-cta: #341f51;; --primary-cta: #1f3251;;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;;
--accent: #6139e6;; --accent: #15479c;;
--background-accent: #b3a8e8;; */ --background-accent: #a8cce8;; */
--background: #f5f5f5;; --background: #f5f5f5;;
--card: #ffffff;; --card: #ffffff;;
--foreground: #1c1c1c;; --foreground: #1c1c1c;;
--primary-cta: #341f51;; --primary-cta: #1f3251;;
--primary-cta-text: #f5f5f5;; --primary-cta-text: #f5f5f5;;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;;
--secondary-cta-text: #1c1c1c;; --secondary-cta-text: #1c1c1c;;
--accent: #6139e6;; --accent: #15479c;;
--background-accent: #b3a8e8;; --background-accent: #a8cce8;;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);