Merge version_3 into main

2025-12-28 16:30:22 +00:00
parent 0b3c3f694d 1369d3c323
commit dd3aefb422
3 changed files with 14 additions and 9 deletions
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -495,7 +495,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-prata), sans-serif;
+  font-family: var(--font-playfair-display --font-roboto), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-prata), sans-serif;
+  font-family: var(--font-playfair-display --font-roboto), sans-serif;
 }
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,13 +1,18 @@
 import type { Metadata } from "next";
-import { Prata } from "next/font/google";
+import { Playfair_Display, Roboto } from "next/font/google";
 import "./globals.css";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";

-const prata = Prata({
-  variable: "--font-prata",
+const playfairDisplay = Playfair_Display({
+  variable: "--font-playfair-display",
  subsets: ["latin"],
-  weight: ["400"],
+});
+
+const roboto = Roboto({
+  variable: "--font-roboto",
+  subsets: ["latin"],
+  weight: ["100", "300", "400", "500", "700", "900"],
 });

 export const metadata: Metadata = {
@@ -44,7 +49,7 @@ export default function RootLayout({
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
        <body
-          className={prata.variable}
+          className={`${playfairDisplay.variable} ${roboto.variable}`}
        >
          <Tag />
          {children}
@@ -1270,4 +1275,4 @@ export default function RootLayout({
      </ServiceWrapper>
    </html>
  );
-}
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -258,4 +258,4 @@ export default function LandingPage() {
      </div>
    </ThemeProvider>
  );
-}
+}