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

Merge version_2 into main #2

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

21
src/app/layout.tsx
View File

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

22
src/app/page.tsx
View File

@@ -15,15 +15,15 @@ import { Sparkles, Zap, TrendingUp, Globe, Star, MessageCircle, Instagram, Twitt
export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="hover-bubble"
defaultTextAnimation="reveal-blur"
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="medium"
background="blurBottom"
cardStyle="inset"
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="solid"
defaultButtonVariant="text-stagger"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="medium"
sizing="large"
background="noise"
cardStyle="glass-depth"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<div id="nav" data-section="nav">
@@ -31,7 +31,7 @@ export default function LandingPage() {
brandName="GlobalTrapClothing"
navItems={[
{ name: "Collections", id: "products" },
{ name: "About", id: "about" },
{ name: "About", id: "features" },
{ name: "Contact", id: "contact" }
]}
/>
@@ -46,7 +46,7 @@ export default function LandingPage() {
tagAnimation="slide-up"
buttons={[
{ text: "Shop Collection", href: "#products" },
{ text: "Learn More", href: "#about" }
{ text: "Learn More", href: "#features" }
]}
buttonAnimation="slide-up"
background={{ variant: "plain" }}

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-source-sans-3), sans-serif;
font-family: var(--font-dm-sans), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
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;
--background-accent: #ffffff; */
--background: #fffefe;
--card: #f6f7f4;
--foreground: #080908;
--primary-cta: #0e3a29;
--background: #0a0a0a;
--card: #1a1a1a;
--foreground: #ffffff;
--primary-cta: #e34400;
--primary-cta-text: #fffefe;
--secondary-cta: #e7eecd;
--secondary-cta: #010101;
--secondary-cta-text: #080908;
--accent: #35c18b;
--background-accent: #ecebe4;
--accent: #ff7b05;
--background-accent: #e34400;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);