bender/3834d54a-c3fe-451d-87ed-2406047db6f8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #6

Merged
bender merged 3 commits from version_4 into main 2026-04-16 23:17:58 +00:00
Conversation 0 Commits 3 Files Changed 3 +11 -14
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/layout.tsx
View File

@@ -8,6 +8,7 @@ import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Public_Sans } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
import { Luckiest_Guy } from "next/font/google";
@@ -22,15 +23,10 @@ export const metadata: Metadata = {
};
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const luckiestGuy = Luckiest_Guy({
variable: "--font-luckiest-guy", subsets: ["latin"],
weight: "400"});
export default function RootLayout({
children,
@@ -40,7 +36,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
<body className={`${luckiestGuy.variable} antialiased`}>
<Tag />
{children}
<script

5
src/app/page.tsx
View File

@@ -9,11 +9,12 @@ import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatin
import ProductCardFour from '@/components/sections/product/ProductCardFour';
import TeamCardSix from '@/components/sections/team/TeamCardSix';
import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
import ButtonTextStagger from '@/components/button/ButtonTextStagger/ButtonTextStagger';
export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultButtonVariant="hover-bubble"
defaultTextAnimation="reveal-blur"
borderRadius="rounded"
contentWidth="smallMedium"
@@ -22,7 +23,7 @@ export default function LandingPage() {
cardStyle="inset"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="solid"
headingFontWeight="semibold"
headingFontWeight="bold"
>
<ReactLenis root>
<div id="nav" data-section="nav">

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-inter), sans-serif;
font-family: var(--font-luckiest-guy), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-libre-baskerville), serif;
font-family: var(--font-luckiest-guy), serif;
}