bender/35ba002f-99ad-4256-8952-e3a3a9d9b784
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_3 bender:version_2 bender:version_1
...
pull from: bender:version_2
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1

5 Commits
version_1 ... version_2

Author SHA1 Message Date
bender
25e0fa19c8 Update src/app/styles/variables.css 2026-03-03 10:30:11 +00:00
bender
1f2ed61e60 Update src/app/styles/base.css 2026-03-03 10:30:10 +00:00
bender
b7357ae3c6 Update src/app/page.tsx 2026-03-03 10:30:09 +00:00
bender
44c8a7a6d8 Update src/app/layout.tsx 2026-03-03 10:30:08 +00:00
bender
386a9e3cf1 Merge version_1 into main 
Merge version_1 into main
 2026-03-03 09:19:36 +00:00
4 changed files with 28 additions and 40 deletions
Expand all files Collapse all files

24
src/app/layout.tsx
View File

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

12
src/app/page.tsx
View File

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

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

@@ -11,7 +11,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-open-sans), sans-serif; font-family: var(--font-poppins), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { 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 */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #f7f6f7;; /* --background: #faf8f5;;
--card: #ffffff;; --card: #fdfcfb;;
--foreground: #1b0c25;; --foreground: #3d2f2a;;
--primary-cta: #1b0c25;; --primary-cta: #8b7355;;
--secondary-cta: #ffffff;; --secondary-cta: #e8dfd5;;
--accent: #ff93e4;; --accent: #d4c4b0;;
--background-accent: #e8a8c3;; */ --background-accent: #c9b8a3;; */
--background: #f7f6f7;; --background: #faf8f5;;
--card: #ffffff;; --card: #fdfcfb;;
--foreground: #1b0c25;; --foreground: #3d2f2a;;
--primary-cta: #1b0c25;; --primary-cta: #8b7355;;
--primary-cta-text: #f7f6f7;; --primary-cta-text: #f7f6f7;;
--secondary-cta: #ffffff;; --secondary-cta: #e8dfd5;;
--secondary-cta-text: #1b0c25;; --secondary-cta-text: #1b0c25;;
--accent: #ff93e4;; --accent: #d4c4b0;;
--background-accent: #e8a8c3;; --background-accent: #c9b8a3;;
/* 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);