bender/35ba002f-99ad-4256-8952-e3a3a9d9b784
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 4 commits from version_2 into main 2026-03-03 10:30:18 +00:00
Conversation 0 Commits 4 Files Changed 4 +28 -40
4 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/layout.tsx
View File

@@ -1,22 +1,12 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Open_Sans } from "next/font/google";
import { Poppins } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans", subsets: ["latin"],
const poppins = Poppins({
variable: "--font-poppins", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export const metadata: Metadata = {
@@ -41,11 +31,9 @@ export default function RootLayout({
children: React.ReactNode;
}>) {
return (
<html lang="en" suppressHydrationWarning>
<html lang="uk" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${inter.variable} ${openSans.variable} antialiased`}
>
<body className={`${poppins.variable} antialiased`}>
<Tag />
{children}

12
src/app/page.tsx
View File

@@ -15,12 +15,12 @@ export default function LandingPage() {
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="reveal-blur"
borderRadius="rounded"
contentWidth="small"
sizing="largeSmallSizeLargeTitles"
background="blurBottom"
borderRadius="soft"
contentWidth="compact"
sizing="mediumSizeLargeTitles"
background="none"
cardStyle="subtle-shadow"
primaryButtonStyle="diagonal-gradient"
primaryButtonStyle="flat"
secondaryButtonStyle="solid"
headingFontWeight="normal"
>
@@ -153,7 +153,7 @@ export default function LandingPage() {
tag="Запишіться зараз"
title="Запішіться на тренування"
description="Подаруйте собі годину турботи та сили. Наші тренери чекають на вас!"
background={{ variant: "sparkles-gradient" }}
background={{ variant: "plain" }}
useInvertedBackground={false}
inputPlaceholder="Ваше ім'я"
buttonText="Записатися"

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

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

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f7f6f7;;
--card: #ffffff;;
--foreground: #1b0c25;;
--primary-cta: #1b0c25;;
--secondary-cta: #ffffff;;
--accent: #ff93e4;;
--background-accent: #e8a8c3;; */
/* --background: #faf8f5;;
--card: #fdfcfb;;
--foreground: #3d2f2a;;
--primary-cta: #8b7355;;
--secondary-cta: #e8dfd5;;
--accent: #d4c4b0;;
--background-accent: #c9b8a3;; */
--background: #f7f6f7;;
--card: #ffffff;;
--foreground: #1b0c25;;
--primary-cta: #1b0c25;;
--background: #faf8f5;;
--card: #fdfcfb;;
--foreground: #3d2f2a;;
--primary-cta: #8b7355;;
--primary-cta-text: #f7f6f7;;
--secondary-cta: #ffffff;;
--secondary-cta: #e8dfd5;;
--secondary-cta-text: #1b0c25;;
--accent: #ff93e4;;
--background-accent: #e8a8c3;;
--accent: #d4c4b0;;
--background-accent: #c9b8a3;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);