bender/4a3ddd58-2cc7-42aa-874c-1f217af54243
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_10 into main

Browse Source 
Merge version_10 into main
This commit was merged in pull request #23.
This commit is contained in:
bender
2026-05-29 23:12:51 +00:00
parent 532f9a777d adc5344b69
commit 24019f2b3c
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/layout.tsx
View File

@@ -26,13 +26,12 @@ export const metadata: Metadata = {
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
const manrope = Manrope({
variable: "--font-manrope", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
});
export default function RootLayout({
@@ -43,7 +42,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}>
<body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
{children}
<script

7
src/app/page.tsx
View File

@@ -26,10 +26,10 @@ export default function WebAgencyThemePage() {
contentWidth="medium"
sizing="medium"
background="aurora"
cardStyle="solid"
primaryButtonStyle="gradient"
cardStyle="glass-elevated"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
headingFontWeight="medium"
headingFontWeight="normal"
>
<ReactLenis root>
<NavbarLayoutFloatingInline
@@ -95,7 +95,6 @@ export default function WebAgencyThemePage() {
useInvertedBackground={false}
imagePosition="left"
textboxLayout="default"
textBoxClassName="bg-card text-foreground p-8 rounded-lg shadow-sm"
mediaAnimation="slide-up"
bulletPoints={[
{

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

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

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #f5f5f5;
--background: #f9fdfc;
--card: #ffffff;
--foreground: #1c1c1c;
--primary-cta: #1f514c;
--foreground: #2e3d3c;
--primary-cta: #80cbc4;
--primary-cta-text: #f5f5f5;
--secondary-cta: #ffffff;
--secondary-cta: #e0f2f1;
--secondary-cta-text: #1c1c1c;
--accent: #159c49;
--background-accent: #a8e8ba;
--accent: #80cbc4;
--background-accent: #e0f2f1;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);