Merge version_2 into main #5

Open
bender wants to merge 3 commits from version_2 into main
3 changed files with 9 additions and 6 deletions

View File

@@ -6,6 +6,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Open_Sans } from "next/font/google";
import { Cormorant_Garamond } from "next/font/google";
@@ -14,8 +15,10 @@ export const metadata: Metadata = {
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({
@@ -26,7 +29,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${openSans.variable} antialiased`}>
<body className={`${cormorantGaramond.variable} antialiased`}>
<Tag />
{children}
<script

View File

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

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