bender/cbd2c9fa-b993-42f3-931e-0fd982ca986f
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_3 into main

Browse Source 
Merge version_3 into main
This commit was merged in pull request #9.
This commit is contained in:
bender
2026-03-13 14:40:48 +00:00
parent dbc72c23d7 a4ac688eb2
commit 6bbf5e3fd0
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File 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 { getVisualEditScript } from "@/utils/visual-edit-script";
import { Source_Sans_3 } from "next/font/google";
import { Trajan_Pro } from "next/font/google";
@@ -14,8 +15,10 @@ export const metadata: Metadata = {
description: 'Премиум салон красоты в Ижевске. Маникюр, парикмахерские услуги, макияж, брови, массаж от опытных мастеров. Рейтинг 5.0★ на основе 211 отзывов. Запись онлайн!',
};
const sourceSans3 = Source_Sans_3({
variable: "--font-source-sans-3", subsets: ["latin"],
const trajanPro = Trajan_Pro({
variable: "--font-trajan-pro", subsets: ["latin"],
weight: ["400", "700"],
});
export default function RootLayout({
@@ -26,7 +29,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${sourceSans3.variable} antialiased`}>
<body className={`${trajanPro.variable} antialiased`}>
<Tag />
{children}
<script

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