Merge version_3 into main #2

Merged
bender merged 4 commits from version_3 into main 2026-03-06 04:24:53 +00:00
4 changed files with 30 additions and 31 deletions

View File

@@ -1,17 +1,16 @@
import type { Metadata } from "next";
import { Poppins } from "next/font/google";
import { Nunito } from "next/font/google";
import { Figtree } from "next/font/google";
import { Mulish } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const poppins = Poppins({
variable: "--font-poppins", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
const figtree = Figtree({
variable: "--font-figtree", subsets: ["latin"],
});
const nunito = Nunito({
variable: "--font-nunito", subsets: ["latin"],
const mulish = Mulish({
variable: "--font-mulish", subsets: ["latin"],
});
export const metadata: Metadata = {
@@ -44,7 +43,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${poppins.variable} ${nunito.variable} antialiased`}
className={`${figtree.variable} ${mulish.variable} antialiased`}
>
<Tag />
{children}

View File

@@ -13,16 +13,16 @@ import { Music, Mic2, Volume2, User, Sparkles, Share2, Mail } from 'lucide-react
export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="bounce-effect"
defaultTextAnimation="background-highlight"
borderRadius="pill"
contentWidth="mediumLarge"
sizing="largeSizeMediumTitles"
background="floatingGradient"
cardStyle="glass-depth"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="radial-glow"
headingFontWeight="bold"
defaultButtonVariant="directional-hover"
defaultTextAnimation="reveal-blur"
borderRadius="rounded"
contentWidth="medium"
sizing="largeSmallSizeLargeTitles"
background="aurora"
cardStyle="gradient-radial"
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="glass-elevated"
headingFontWeight="extrabold"
>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
@@ -50,7 +50,7 @@ export default function LandingPage() {
{ text: "Get in Touch", href: "#contact" }
]}
buttonAnimation="slide-up"
background={{ variant: "radial-gradient" }}
background={{ variant: "rotated-rays-animated" }}
dashboard={{
title: "Recent Work", logoIcon: Music,
imageSrc: "http://img.b2bpic.net/free-photo/professional-studio-control-room-with-pre-knobs-faders_482257-121167.jpg", searchPlaceholder: "Search projects...", sidebarItems: [
@@ -111,7 +111,7 @@ export default function LandingPage() {
}
]}
gridVariant="uniform-all-items-equal"
animationType="slide-up"
animationType="scale-rotate"
textboxLayout="default"
useInvertedBackground={false}
/>
@@ -128,7 +128,7 @@ export default function LandingPage() {
textboxLayout="default"
useInvertedBackground={true}
showCard={true}
speed={40}
speed={25}
/>
</div>
@@ -139,7 +139,7 @@ export default function LandingPage() {
tagAnimation="slide-up"
title="Ready to Mix? Let's Create."
description="Whether you need professional mixing, drumming services, or production consultation, I'm here to help elevate your sound. Send me a message and let's discuss your project."
background={{ variant: "sparkles-gradient" }}
background={{ variant: "gradient-bars" }}
useInvertedBackground={false}
imageSrc="http://img.b2bpic.net/free-photo/closeup-professional-microphone-swivel-boom-arm-stand-empty-vlog-broadcasting-studio-used-recording-social-media-content-detail-audio-live-broadcast-digital-mic_482257-36751.jpg"
imageAlt="Professional microphone setup"

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-poppins), sans-serif;
font-family: var(--font-figtree), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-poppins), sans-serif;
font-family: var(--font-figtree), sans-serif;
}

View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #fff8f3;
--card: #ffe8d9;
--foreground: #2b1810;
--primary-cta: #ff6b35;
--background: #0a0a0a;
--card: #1a1a1a;
--foreground: #ffffffe6;
--primary-cta: #e34400;
--primary-cta-text: #ffffff;
--secondary-cta: #ffe8d9;
--secondary-cta: #1a1a1a;
--secondary-cta-text: #000612e6;
--accent: #ffa500;
--background-accent: #ffb84d;
--accent: #ff7b05;
--background-accent: #f96b2f;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);