Merge version_2 into main #3

Merged
bender merged 3 commits from version_2 into main 2026-05-07 06:33:54 +00:00
3 changed files with 14 additions and 18 deletions

View File

@@ -21,13 +21,9 @@ export const metadata: Metadata = {
},
};
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"],
variable: "--font-inter", subsets: ["latin"],
});
export default function RootLayout({
@@ -38,7 +34,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${inter.variable} ${openSans.variable} antialiased`}>
<body className={`${inter.variable} antialiased`}>
<Tag />
{children}
<script

View File

@@ -17,16 +17,16 @@ import { Clock, Settings, Star, TrendingUp, Zap } from "lucide-react";
export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="bounce-effect"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="reveal-blur"
borderRadius="pill"
contentWidth="medium"
sizing="mediumLargeSizeMediumTitles"
background="grid"
cardStyle="solid"
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="radial-glow"
headingFontWeight="normal"
sizing="medium"
background="noise"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
@@ -171,4 +171,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-open-sans), sans-serif;
font-family: var(--font-inter), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;