bender/17fa0519-e4f1-4586-b31a-33656dd5d8eb
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #3

Merged
bender merged 4 commits from version_3 into main 2026-03-03 23:19:51 +00:00
Conversation 0 Commits 4 Files Changed 4 +30 -36
4 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/layout.tsx
View File

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

12
src/app/page.tsx
View File

@@ -14,16 +14,16 @@ import { Sparkles, Package, Lightbulb, HelpCircle, Star } from "lucide-react";
export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="directional-hover"
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="largeSmall"
background="blurBottom"
cardStyle="soft-shadow"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
headingFontWeight="extrabold"
background="none"
cardStyle="solid"
primaryButtonStyle="flat"
secondaryButtonStyle="solid"
headingFontWeight="bold"
>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen

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

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

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #fffefe;;
--card: #f6f7f4;;
--foreground: #080908;;
--primary-cta: #0e3a29;;
--secondary-cta: #e7eecd;;
--accent: #35c18b;;
--background-accent: #ecebe4;; */
/* --background: #f5f0e8;;
--card: #ede5d8;;
--foreground: #2b1810;;
--primary-cta: #8b6914;;
--secondary-cta: #1a3a52;;
--accent: #b8111f;;
--background-accent: #2d5016;; */
--background: #fffefe;;
--card: #f6f7f4;;
--foreground: #080908;;
--primary-cta: #0e3a29;;
--background: #f5f0e8;;
--card: #ede5d8;;
--foreground: #2b1810;;
--primary-cta: #8b6914;;
--primary-cta-text: #f6f0e9;;
--secondary-cta: #e7eecd;;
--secondary-cta: #1a3a52;;
--secondary-cta-text: #2b180a;;
--accent: #35c18b;;
--background-accent: #ecebe4;;
--accent: #b8111f;;
--background-accent: #2d5016;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);