bender/5710dea2-fb28-4d3e-beea-7632329a6dc9
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 3 commits from version_2 into main 2026-03-06 10:18:12 +00:00
Conversation 0 Commits 3 Files Changed 3 +17 -30
3 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/layout.tsx
View File

@@ -1,21 +1,10 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Manrope } 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 inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const manrope = Manrope({
variable: "--font-manrope", subsets: ["latin"],
});
@@ -39,9 +28,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${manrope.variable} ${dmSans.variable} antialiased`}
>
<body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
<Tag />
{children}

18
src/app/page.tsx
View File

@@ -11,16 +11,16 @@ import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="background-highlight"
defaultButtonVariant="text-shift"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="mediumLarge"
sizing="largeSmallSizeMediumTitles"
background="fluid"
cardStyle="gradient-bordered"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="glass"
headingFontWeight="light"
sizing="largeSizeMediumTitles"
background="none"
cardStyle="solid"
primaryButtonStyle="flat"
secondaryButtonStyle="solid"
headingFontWeight="bold"
>
<div id="nav" data-section="nav">
<NavbarStyleCentered
@@ -54,7 +54,7 @@ export default function LandingPage() {
<div id="featured" data-section="featured">
<ProductCardThree
title="NEW COLLECTION"
title="FEATURED COLLECTION"
description="Explore our latest performance apparel designed for those who push limits"
products={[
{

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

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #0B0B0B;
--card: #121212;
--foreground: #F2F2F2;
--primary-cta: #F2F2F2;
--background: #0a0a0a;
--card: #1a1a1a;
--foreground: #ffffff;
--primary-cta: #ffffff;
--primary-cta-text: #0B0B0B;
--secondary-cta: #0B0B0B;
--secondary-cta: #1a1a1a;
--secondary-cta-text: #F2F2F2;
--accent: #0B0B0B;
--background-accent: #0B0B0B;
--accent: #ffffff;
--background-accent: #ffffff;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);