bender/298ea047-501e-4c0e-a747-eee712bec209
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

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

6 Commits
version_2 ... main

Author SHA1 Message Date
bender
e5340ab761 Update src/app/styles/base.css 2026-03-11 10:20:54 +00:00
bender
2c20a5cf71 Update src/app/page.tsx 2026-03-11 10:20:54 +00:00
bender
3e952d7042 Update src/app/layout.tsx 2026-03-11 10:20:54 +00:00
bender
2cb5c13f6d Merge version_3 into main 
Merge version_3 into main
 2026-03-11 10:18:55 +00:00
bender
aff0d797c9 Update src/app/styles/base.css 2026-03-11 10:18:51 +00:00
bender
4b9010ea02 Update src/app/layout.tsx 2026-03-11 10:18:50 +00:00
3 changed files with 9 additions and 6 deletions
Expand all files Collapse all files

9
src/app/layout.tsx
View File

@@ -6,6 +6,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 { Open_Sans } from "next/font/google"; import { Open_Sans } from "next/font/google";
import { Cormorant_Garamond } from "next/font/google";
@@ -14,8 +15,10 @@ export const metadata: Metadata = {
description: 'Профессиональный салон красоты в Астане. Гель-лак, наращивание, SMART педикюр. Качество, гигиена и мастерство гарантированы. Запишитесь онлайн.', description: 'Профессиональный салон красоты в Астане. Гель-лак, наращивание, SMART педикюр. Качество, гигиена и мастерство гарантированы. Запишитесь онлайн.',
}; };
const openSans = Open_Sans({
variable: "--font-open-sans", subsets: ["latin"], const cormorantGaramond = Cormorant_Garamond({
variable: "--font-cormorant-garamond", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
}); });
export default function RootLayout({ export default function RootLayout({
@@ -26,7 +29,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${openSans.variable} antialiased`}> <body className={`${cormorantGaramond.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

2
src/app/page.tsx
View File

@@ -18,7 +18,7 @@ export default function LandingPage() {
<ThemeProvider <ThemeProvider
defaultButtonVariant="expand-hover" defaultButtonVariant="expand-hover"
defaultTextAnimation="background-highlight" defaultTextAnimation="background-highlight"
borderRadius="rounded" borderRadius="pill"
contentWidth="small" contentWidth="small"
sizing="mediumLarge" sizing="mediumLarge"
background="circleGradient" background="circleGradient"

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-cormorant-garamond), 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-open-sans), sans-serif; font-family: var(--font-cormorant-garamond), sans-serif;
} }