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

Compare commits

base: bender:version_2
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1
..
compare: bender:version_3
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1

6 Commits
version_2 ... version_3

Author SHA1 Message Date
bender
fa76c7e3f6 Update src/app/styles/base.css 2026-03-13 14:42:25 +00:00
bender
2eae07ca06 Update src/app/layout.tsx 2026-03-13 14:42:24 +00:00
bender
a4ac688eb2 Update src/app/styles/base.css 2026-03-13 14:40:44 +00:00
bender
9b5afd4963 Update src/app/layout.tsx 2026-03-13 14:40:43 +00:00
bender
dbc72c23d7 Merge version_2 into main 
Merge version_2 into main
 2026-03-13 14:16:30 +00:00
bender
0cff24d05b Merge version_2 into main 
Merge version_2 into main
 2026-03-13 14:15:26 +00:00
2 changed files with 9 additions and 5 deletions
Expand all files Collapse all files

10
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 { Source_Sans_3 } from "next/font/google"; import { Source_Sans_3 } from "next/font/google";
import { Trajan_Pro } from "next/font/google";
@@ -14,8 +15,11 @@ export const metadata: Metadata = {
description: 'Премиум салон красоты в Ижевске. Маникюр, парикмахерские услуги, макияж, брови, массаж от опытных мастеров. Рейтинг 5.0★ на основе 211 отзывов. Запись онлайн!', 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({ export default function RootLayout({
@@ -26,7 +30,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${sourceSans3.variable} antialiased`}> <body className={`${trajanPro.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

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-source-sans-3), sans-serif; font-family: undefined;
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-source-sans-3), sans-serif; font-family: var(--font-trajan-pro), serif;
} }