Merge version_3 into main

Update src/app/styles/base.css
2026-03-13 14:43:15 +00:00 · 2026-03-13 14:42:47 +00:00 · 2026-03-13 14:42:46 +00:00 · 2026-03-13 14:42:25 +00:00 · 2026-03-13 14:42:24 +00:00 · 2026-03-13 14:42:05 +00:00
2 changed files with 9 additions and 5 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -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,11 @@ 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 +30,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${sourceSans3.variable} antialiased`}>
+        <body className={`${trajanPro.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-source-sans-3), sans-serif;
+  font-family: undefined;
  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), serif;
 }
Author	SHA1	Message	Date
bender	3c8c84783d	Merge version_3 into main Merge version_3 into main	2026-03-13 14:43:15 +00:00
bender	f4db04413d	Update src/app/styles/base.css	2026-03-13 14:42:47 +00:00
bender	64f3a07abd	Update src/app/layout.tsx	2026-03-13 14:42:46 +00:00
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	6ff4d80b72	Switch to version 2: modified src/app/styles/base.css	2026-03-13 14:42:05 +00:00
bender	5a032b94ea	Switch to version 2: modified src/app/layout.tsx	2026-03-13 14:42:05 +00:00
bender	6bbf5e3fd0	Merge version_3 into main Merge version_3 into main	2026-03-13 14:40:48 +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	9688cbafbe	Update src/app/page.tsx	2026-03-13 14:16:26 +00:00
bender	0cff24d05b	Merge version_2 into main Merge version_2 into main	2026-03-13 14:15:26 +00:00
bender	4b7793b453	Update src/app/page.tsx	2026-03-13 14:15:22 +00:00
bender	003b7f3d02	Merge version_1 into main Merge version_1 into main	2026-03-13 11:45:58 +00:00
bender	4598c91de8	Merge version_1 into main Merge version_1 into main	2026-03-13 11:44:54 +00:00
bender	7386873e26	Merge version_1 into main Merge version_1 into main	2026-03-13 11:38:59 +00:00
bender	a28e0d2279	Merge version_1 into main Merge version_1 into main	2026-03-13 11:25:19 +00:00
bender	f53bc39590	Merge version_1 into main Merge version_1 into main	2026-03-13 11:24:54 +00:00
bender	7a290a5595	Merge version_1 into main Merge version_1 into main	2026-03-13 11:23:55 +00:00