Merge version_2 into main #2

Merged
bender merged 3 commits from version_2 into main 2026-06-06 06:34:54 +00:00
3 changed files with 31 additions and 7 deletions

View File

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

View File

@@ -27,7 +27,7 @@ export default function LandingPage() {
cardStyle="inset"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="layered"
headingFontWeight="semibold"
headingFontWeight="bold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
@@ -47,6 +47,8 @@ export default function LandingPage() {
name: "Цены", id: "#pricing"},
{
name: "Контакты", id: "#contact"},
{
name: "Instagram", id: "#instagram"},
]}
brandName="Ясин Кафе"
button={{
@@ -246,6 +248,23 @@ export default function LandingPage() {
/>
</div>
<div id="instagram" data-section="instagram">
<SocialProofOne
textboxLayout="default"
useInvertedBackground={true}
names={[
"Ежедневные обновления", "Акции и конкурсы", "Вкусные моменты"
]}
title="Наш Instagram"
description="Подпишитесь на нас в Instagram, чтобы быть в курсе всех новостей, акций и наслаждаться аппетитными фотографиями наших блюд!"
buttons={[
{
text: "Перейти в Instagram", href: "https://www.instagram.com/yasin.shayhana.shymkent", target: "_blank"
}
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
logoText="Ясин Кафе"

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-raleway), sans-serif;
font-family: var(--font-inter), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-raleway), sans-serif;
font-family: var(--font-libre-baskerville), serif;
}