development/06606df9-249b-42b7-87a1-795d58356690
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: development:version_2
Branches Tags
development:main development:version_13 development:version_12 development:version_11 development:version_10 development:version_9 development:version_8 development:version_7 development:version_6 development:version_5 development:version_3 development:version_4 development:version_2 development:version_1
...
pull from: development:version_4
Branches Tags
development:main development:version_13 development:version_12 development:version_11 development:version_10 development:version_9 development:version_8 development:version_7 development:version_6 development:version_5 development:version_3 development:version_4 development:version_2 development:version_1

3 Commits
version_2 ... version_4

Author SHA1 Message Date
development
1369d3c323 Update src/app/page.tsx 2025-12-28 16:30:18 +00:00
development
095228a616 Update src/app/layout.tsx 2025-12-28 16:30:17 +00:00
development
30917471d5 Update src/app/globals.css 2025-12-28 16:30:16 +00:00
3 changed files with 14 additions and 9 deletions
Expand all files Collapse all files

4
src/app/globals.css
View File

@@ -495,7 +495,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-prata), sans-serif; font-family: var(--font-playfair-display --font-roboto), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-prata), sans-serif; font-family: var(--font-playfair-display --font-roboto), sans-serif;
} }

15
src/app/layout.tsx
View File

@@ -1,13 +1,18 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Prata } from "next/font/google"; import { Playfair_Display, Roboto } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
const prata = Prata({ const playfairDisplay = Playfair_Display({
variable: "--font-prata", variable: "--font-playfair-display",
subsets: ["latin"], subsets: ["latin"],
weight: ["400"], });
const roboto = Roboto({
variable: "--font-roboto",
subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -44,7 +49,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={prata.variable} className={`${playfairDisplay.variable} ${roboto.variable}`}
> >
<Tag /> <Tag />
{children} {children}