bender/efae9c5c-297a-4542-a8ce-0b02b7f72513
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

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

23 Commits
version_1 ... main

Author SHA1 Message Date
bender
6b4f2cc701 Update src/app/page.tsx 2026-03-03 13:49:29 +00:00
bender
6bb6eba80d Merge version_1 into main 
Merge version_1 into main
 2026-03-03 13:46:21 +00:00
bender
226b40a174 Update src/app/styles/variables.css 2026-03-03 13:45:51 +00:00
bender
e98f80c3b9 Update src/app/page.tsx 2026-03-03 13:45:50 +00:00
bender
9ea3684d41 Update src/app/layout.tsx 2026-03-03 13:45:50 +00:00
bender
27afc0506b Merge version_1 into main 
Merge version_1 into main
 2026-03-03 13:44:03 +00:00
bender
541cc13b51 Switch to version 1: modified src/app/styles/variables.css 2026-03-03 13:43:37 +00:00
bender
7b078f68a9 Switch to version 1: modified src/app/styles/base.css 2026-03-03 13:43:35 +00:00
bender
53bcd7d86a Switch to version 1: modified src/app/page.tsx 2026-03-03 13:43:34 +00:00
bender
11f423c171 Switch to version 1: modified src/app/layout.tsx 2026-03-03 13:43:33 +00:00
bender
e31a93e843 Merge version_3 into main 
Merge version_3 into main
 2026-03-03 13:42:54 +00:00
bender
2dec505fc5 Update src/app/page.tsx 2026-03-03 13:42:48 +00:00
bender
6683c43acf Merge version_1 into main 
Merge version_1 into main
 2026-03-03 13:41:37 +00:00
bender
8508a85c8b Merge version_1 into main 
Merge version_1 into main
 2026-03-03 13:40:51 +00:00
bender
8e7fd13a44 Merge version_3 into main 
Merge version_3 into main
 2026-03-03 13:40:14 +00:00
bender
53146c648c Update src/app/page.tsx 2026-03-03 13:40:08 +00:00
bender
14dc5a460c Update src/app/layout.tsx 2026-03-03 13:40:07 +00:00
bender
604bf00915 Merge version_2 into main 
Merge version_2 into main
 2026-03-03 13:39:09 +00:00
bender
1292b1a8be Update src/app/styles/variables.css 2026-03-03 13:39:04 +00:00
bender
f76b367048 Update src/app/styles/base.css 2026-03-03 13:39:03 +00:00
bender
89d7709e6b Update src/app/page.tsx 2026-03-03 13:39:02 +00:00
bender
228b455576 Update src/app/layout.tsx 2026-03-03 13:39:01 +00:00
bender
d1a65df758 Merge version_1 into main 
Merge version_1 into main
 2026-03-03 13:37:27 +00:00
3 changed files with 12 additions and 11 deletions
Expand all files Collapse all files

9
src/app/layout.tsx
View File

@@ -1,12 +1,13 @@
import type { Metadata } from "next";
import { Public_Sans } from "next/font/google";
import { Poppins } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const publicSans = Public_Sans({
variable: "--font-public-sans", subsets: ["latin"],
const poppins = Poppins({
variable: "--font-poppins", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
const inter = Inter({
@@ -39,7 +40,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${publicSans.variable} ${inter.variable} antialiased`}
className={`${poppins.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}

6
src/app/page.tsx
View File

@@ -10,7 +10,7 @@ import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
import ContactText from '@/components/sections/contact/ContactText';
import FooterMedia from '@/components/sections/footer/FooterMedia';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { PawPrint } from "lucide-react";
import { Heart, Award, CheckCircle, Sparkles } from "lucide-react";
export default function LandingPage() {
return (
@@ -45,9 +45,9 @@ export default function LandingPage() {
<HeroBillboardRotatedCarousel
title="Welcome to Pet City"
description="Your one-stop shop for everything your furry friends need. Quality pet products, expert care, and a community of pet lovers."
background={{ variant: "plain" }}
background={{ variant: "sparkles-gradient" }}
tag="Pet Care Excellence"
tagIcon={PawPrint}
tagIcon={Sparkles}
tagAnimation="slide-up"
buttons={[
{ text: "Shop Now", href: "#products" },

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

@@ -7,8 +7,8 @@
--foreground: #000f06e6;;
--primary-cta: #0a7039;;
--secondary-cta: #f9f9f9;;
--accent: #e2e2e2;;
--background-accent: #c4c4c4;; */
--accent: #35c18b;;
--background-accent: #d4e8d9;; */
--background: #ffffff;;
--card: #f9f9f9;;
@@ -17,8 +17,8 @@
--primary-cta-text: #ffffff;;
--secondary-cta: #f9f9f9;;
--secondary-cta-text: #000f06e6;;
--accent: #e2e2e2;;
--background-accent: #c4c4c4;;
--accent: #35c18b;;
--background-accent: #d4e8d9;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);