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

Compare commits

merge into: bender:version_2
Branches Tags
bender:main bender:version_2 bender:version_3 bender:version_1
...
pull from: bender:version_3
Branches Tags
bender:version_2 bender:main bender:version_3 bender:version_1

5 Commits
version_2 ... version_3

Author SHA1 Message Date
bender
02951a6801 Update src/app/styles/variables.css 2026-03-03 23:19:47 +00:00
bender
c3b268ad85 Update src/app/styles/base.css 2026-03-03 23:19:46 +00:00
bender
d320e39c1c Update src/app/page.tsx 2026-03-03 23:19:46 +00:00
bender
38850cbd3e Update src/app/layout.tsx 2026-03-03 23:19:45 +00:00
bender
3ee7ef2cb6 Merge version_2 into main 
Merge version_2 into main
 2026-03-03 23:10:27 +00:00
4 changed files with 30 additions and 36 deletions
Expand all files Collapse all files

22
src/app/layout.tsx
View File

@@ -1,23 +1,17 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Poppins } from "next/font/google"; import { Crimson_Text } from "next/font/google";
import { Halant } from "next/font/google"; import { DM_Sans } from "next/font/google";
import { Inter } 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 poppins = Poppins({ const crimsonText = Crimson_Text({
variable: "--font-poppins", subsets: ["latin"], variable: "--font-crimson-text", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"], weight: ["400", "600"],
}); });
const halant = Halant({ const dmSans = DM_Sans({
variable: "--font-halant", subsets: ["latin"], variable: "--font-dm-sans", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -50,7 +44,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${poppins.variable} ${halant.variable} ${inter.variable} antialiased`} className={`${crimsonText.variable} ${dmSans.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {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() { export default function LandingPage() {
return ( return (
<ThemeProvider <ThemeProvider
defaultButtonVariant="directional-hover" defaultButtonVariant="hover-magnetic"
defaultTextAnimation="entrance-slide" defaultTextAnimation="entrance-slide"
borderRadius="rounded" borderRadius="rounded"
contentWidth="mediumSmall" contentWidth="mediumSmall"
sizing="largeSmall" sizing="largeSmall"
background="blurBottom" background="none"
cardStyle="soft-shadow" cardStyle="solid"
primaryButtonStyle="primary-glow" primaryButtonStyle="flat"
secondaryButtonStyle="radial-glow" secondaryButtonStyle="solid"
headingFontWeight="extrabold" headingFontWeight="bold"
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
<NavbarStyleFullscreen <NavbarStyleFullscreen

4
src/app/styles/base.css
View File

@@ -11,7 +11,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-poppins), sans-serif; font-family: var(--font-crimson-text), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { 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 */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #fffefe;; /* --background: #f5f0e8;;
--card: #f6f7f4;; --card: #ede5d8;;
--foreground: #080908;; --foreground: #2b1810;;
--primary-cta: #0e3a29;; --primary-cta: #8b6914;;
--secondary-cta: #e7eecd;; --secondary-cta: #1a3a52;;
--accent: #35c18b;; --accent: #b8111f;;
--background-accent: #ecebe4;; */ --background-accent: #2d5016;; */
--background: #fffefe;; --background: #f5f0e8;;
--card: #f6f7f4;; --card: #ede5d8;;
--foreground: #080908;; --foreground: #2b1810;;
--primary-cta: #0e3a29;; --primary-cta: #8b6914;;
--primary-cta-text: #f6f0e9;; --primary-cta-text: #f6f0e9;;
--secondary-cta: #e7eecd;; --secondary-cta: #1a3a52;;
--secondary-cta-text: #2b180a;; --secondary-cta-text: #2b180a;;
--accent: #35c18b;; --accent: #b8111f;;
--background-accent: #ecebe4;; --background-accent: #2d5016;;
/* 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);