bender/5710dea2-fb28-4d3e-beea-7632329a6dc9
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_2 bender:version_1
...
pull from: bender:version_2
Branches Tags
bender:main bender:version_2 bender:version_1

4 Commits
version_1 ... version_2

Author SHA1 Message Date
bender
85da1cfbd3 Update src/app/styles/variables.css 2026-03-06 10:18:08 +00:00
bender
5c83e33323 Update src/app/page.tsx 2026-03-06 10:18:07 +00:00
bender
e23736d223 Update src/app/layout.tsx 2026-03-06 10:18:06 +00:00
bender
d7a4bb504a Merge version_1 into main 
Merge version_1 into main
 2026-03-06 10:13:46 +00:00
3 changed files with 17 additions and 30 deletions
Expand all files Collapse all files

15
src/app/layout.tsx
View File

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

18
src/app/page.tsx
View File

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

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

@@ -10,15 +10,15 @@
--accent: #ffffff; --accent: #ffffff;
--background-accent: #ffffff; */ --background-accent: #ffffff; */
--background: #0B0B0B; --background: #0a0a0a;
--card: #121212; --card: #1a1a1a;
--foreground: #F2F2F2; --foreground: #ffffff;
--primary-cta: #F2F2F2; --primary-cta: #ffffff;
--primary-cta-text: #0B0B0B; --primary-cta-text: #0B0B0B;
--secondary-cta: #0B0B0B; --secondary-cta: #1a1a1a;
--secondary-cta-text: #F2F2F2; --secondary-cta-text: #F2F2F2;
--accent: #0B0B0B; --accent: #ffffff;
--background-accent: #0B0B0B; --background-accent: #ffffff;
/* 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);