bender/7ead43df-daeb-4877-9c19-63e31d3172c3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

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

8 Commits
version_1 ... main

Author SHA1 Message Date
bender
9341b230b3 Merge version_2 into main 
Merge version_2 into main
 2026-06-12 13:35:12 +00:00
bender
efa7b25d27 Update src/app/page.tsx 2026-06-12 13:35:09 +00:00
bender
0f6fa06d72 Merge version_2 into main 
Merge version_2 into main
 2026-06-12 13:34:27 +00:00
bender
b41704abe5 Update src/app/styles/variables.css 2026-06-12 13:34:21 +00:00
bender
0323a548ad Update src/app/styles/base.css 2026-06-12 13:34:21 +00:00
bender
9e38ae9061 Update src/app/page.tsx 2026-06-12 13:34:20 +00:00
bender
72ff2d14a4 Update src/app/layout.tsx 2026-06-12 13:34:20 +00:00
bender
9e2fd9537a Merge version_1 into main 
Merge version_1 into main
 2026-06-12 13:33:33 +00:00
4 changed files with 22 additions and 23 deletions
Expand all files Collapse all files

13
src/app/layout.tsx
View File

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Libre_Baskerville } from "next/font/google"; import { Libre_Baskerville } from "next/font/google";
import { DM_Sans } from "next/font/google";
@@ -41,14 +42,12 @@ export const metadata: Metadata = {
}, },
}; };
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville", const dmSans = DM_Sans({
subsets: ["latin"], variable: "--font-dm-sans", subsets: ["latin"],
weight: ["400", "700"],
}); });
const inter = Inter({ const inter = Inter({
variable: "--font-inter", variable: "--font-inter", subsets: ["latin"],
subsets: ["latin"],
}); });
export default function RootLayout({ export default function RootLayout({
@@ -59,7 +58,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}> <body className={`${dmSans.variable} ${inter.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

14
src/app/page.tsx
View File

@@ -18,15 +18,15 @@ import { Crown, Droplet, Feather, Heart, Palette, Scissors, Sparkles, Star } fro
export default function LandingPage() { export default function LandingPage() {
return ( return (
<ThemeProvider <ThemeProvider
defaultButtonVariant="text-shift" defaultButtonVariant="directional-hover"
defaultTextAnimation="entrance-slide" defaultTextAnimation="reveal-blur"
borderRadius="soft" borderRadius="soft"
contentWidth="compact" contentWidth="compact"
sizing="largeSmallSizeLargeTitles" sizing="largeSmallSizeLargeTitles"
background="floatingGradient" background="floatingGradient"
cardStyle="gradient-radial" cardStyle="soft-shadow"
primaryButtonStyle="flat" primaryButtonStyle="shadow"
secondaryButtonStyle="layered" secondaryButtonStyle="glass"
headingFontWeight="semibold" headingFontWeight="semibold"
> >
<ReactLenis root> <ReactLenis root>
@@ -304,7 +304,7 @@ export default function LandingPage() {
{ {
title: "Kontakt", items: [ title: "Kontakt", items: [
{ {
label: "Termin vereinbaren", href: "#contact"}, label: "Termin vereinbaren", href: "#contact"},
{ {
label: "Anfahrt", href: "#"}, label: "Anfahrt", href: "#"},
{ {
@@ -319,4 +319,4 @@ export default function LandingPage() {
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

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

@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-libre-baskerville), serif; font-family: var(--font-dm-sans), sans-serif;
} }

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

@@ -10,15 +10,15 @@
--accent: #ffffff; --accent: #ffffff;
--background-accent: #ffffff; */ --background-accent: #ffffff; */
--background: #f7f6f7; --background: #f5f4f0;
--card: #ffffff; --card: #ffffff;
--foreground: #1b0c25; --foreground: #1a1a1a;
--primary-cta: #1b0c25; --primary-cta: #2c2c2c;
--primary-cta-text: #f7f6f7; --primary-cta-text: #f5f4f0;
--secondary-cta: #ffffff; --secondary-cta: #f5f4f0;
--secondary-cta-text: #1b0c25; --secondary-cta-text: #1a1a1a;
--accent: #ff93e4; --accent: #8a8a8a;
--background-accent: #e8a8c3; --background-accent: #e8e6e1;
/* 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);