bender/3758e063-4e4f-4b69-9c79-04d80a4d2ec0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

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

6 Commits
version_1 ... version_2

Author SHA1 Message Date
bender
fd9aa6e26d Update src/app/page.tsx 2026-03-06 09:13:17 +00:00
bender
4dbb4f562d Update src/app/styles/variables.css 2026-03-06 09:12:02 +00:00
bender
18e104bf78 Update src/app/styles/base.css 2026-03-06 09:12:02 +00:00
bender
eeedc6479e Update src/app/page.tsx 2026-03-06 09:12:01 +00:00
bender
e4cf321d18 Update src/app/layout.tsx 2026-03-06 09:12:00 +00:00
bender
4d4b48c4d4 Merge version_1 into main 
Merge version_1 into main
 2026-03-06 09:11:10 +00:00
4 changed files with 30 additions and 35 deletions
Expand all files Collapse all files

21
src/app/layout.tsx
View File

@@ -1,22 +1,17 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Halant } from "next/font/google"; import { Poppins } from "next/font/google";
import { Inter } from "next/font/google"; import { DM_Sans } from "next/font/google";
import { Source_Sans_3 } 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 halant = Halant({ const poppins = Poppins({
variable: "--font-halant", subsets: ["latin"], variable: "--font-poppins", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"], weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
}); });
const inter = Inter({ const dmSans = DM_Sans({
variable: "--font-inter", subsets: ["latin"], variable: "--font-dm-sans", subsets: ["latin"],
});
const sourceSans3 = Source_Sans_3({
variable: "--font-source-sans-3", subsets: ["latin"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -49,7 +44,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${halant.variable} ${inter.variable} ${sourceSans3.variable} antialiased`} className={`${poppins.variable} ${dmSans.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}

26
src/app/page.tsx
View File

@@ -15,15 +15,15 @@ import { Sparkles, Zap, TrendingUp, Globe, Star, MessageCircle, Instagram, Twitt
export default function LandingPage() { export default function LandingPage() {
return ( return (
<ThemeProvider <ThemeProvider
defaultButtonVariant="hover-bubble" defaultButtonVariant="text-stagger"
defaultTextAnimation="reveal-blur" defaultTextAnimation="entrance-slide"
borderRadius="rounded" borderRadius="pill"
contentWidth="mediumSmall" contentWidth="medium"
sizing="medium" sizing="large"
background="blurBottom" background="noise"
cardStyle="inset" cardStyle="glass-depth"
primaryButtonStyle="diagonal-gradient" primaryButtonStyle="shadow"
secondaryButtonStyle="solid" secondaryButtonStyle="glass"
headingFontWeight="bold" headingFontWeight="bold"
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
@@ -31,7 +31,7 @@ export default function LandingPage() {
brandName="GlobalTrapClothing" brandName="GlobalTrapClothing"
navItems={[ navItems={[
{ name: "Collections", id: "products" }, { name: "Collections", id: "products" },
{ name: "About", id: "about" }, { name: "About", id: "features" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }
]} ]}
/> />
@@ -46,7 +46,7 @@ export default function LandingPage() {
tagAnimation="slide-up" tagAnimation="slide-up"
buttons={[ buttons={[
{ text: "Shop Collection", href: "#products" }, { text: "Shop Collection", href: "#products" },
{ text: "Learn More", href: "#about" } { text: "Learn More", href: "#features" }
]} ]}
buttonAnimation="slide-up" buttonAnimation="slide-up"
background={{ variant: "plain" }} background={{ variant: "plain" }}
@@ -110,7 +110,7 @@ export default function LandingPage() {
id: "04", title: "Authentic Culture", description: "Supporting independent artists and streetwear movements worldwide", imageSrc: "http://img.b2bpic.net/free-vector/flat-design-brutalism-template_23-2149733972.jpg?_wi=2", imageAlt: "Cultural authenticity" id: "04", title: "Authentic Culture", description: "Supporting independent artists and streetwear movements worldwide", imageSrc: "http://img.b2bpic.net/free-vector/flat-design-brutalism-template_23-2149733972.jpg?_wi=2", imageAlt: "Cultural authenticity"
} }
]} ]}
gridVariant="four-items-2x2-equal-grid" gridVariant="uniform-all-items-equal"
animationType="slide-up" animationType="slide-up"
textboxLayout="default" textboxLayout="default"
useInvertedBackground={true} useInvertedBackground={true}
@@ -189,7 +189,7 @@ export default function LandingPage() {
id: "4", value: "24", title: "Hours", description: "Average fulfillment time", icon: Zap id: "4", value: "24", title: "Hours", description: "Average fulfillment time", icon: Zap
} }
]} ]}
gridVariant="four-items-2x2-equal-grid" gridVariant="uniform-all-items-equal"
animationType="slide-up" animationType="slide-up"
textboxLayout="default" textboxLayout="default"
useInvertedBackground={true} useInvertedBackground={true}

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-source-sans-3), sans-serif; font-family: var(--font-dm-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-source-sans-3), sans-serif; font-family: var(--font-poppins), sans-serif;
} }

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

@@ -10,15 +10,15 @@
--accent: #ffffff; --accent: #ffffff;
--background-accent: #ffffff; */ --background-accent: #ffffff; */
--background: #fffefe; --background: #0a0a0a;
--card: #f6f7f4; --card: #1a1a1a;
--foreground: #080908; --foreground: #ffffff;
--primary-cta: #0e3a29; --primary-cta: #e34400;
--primary-cta-text: #fffefe; --primary-cta-text: #fffefe;
--secondary-cta: #e7eecd; --secondary-cta: #010101;
--secondary-cta-text: #080908; --secondary-cta-text: #080908;
--accent: #35c18b; --accent: #ff7b05;
--background-accent: #ecebe4; --background-accent: #e34400;
/* 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);