development/daba9b53-36bf-430f-8aff-374b4099e1f4
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: development:version_1
Branches Tags
development:main development:version_5 development:version_4 development:version_2 development:version_3 development:version_1
...
pull from: development:version_4
Branches Tags
development:version_5 development:main development:version_4 development:version_2 development:version_3 development:version_1

4 Commits
version_1 ... version_4

Author SHA1 Message Date
development
80f23a96fd Update src/app/globals.css 2026-01-06 11:31:11 +00:00
development
52f212e506 Update src/app/page.tsx 2026-01-06 11:17:25 +00:00
development
7745000316 Update src/app/layout.tsx 2026-01-06 11:17:24 +00:00
development
a37cec8dec Update src/app/globals.css 2026-01-06 11:17:23 +00:00
3 changed files with 16 additions and 11 deletions
Expand all files Collapse all files

8
src/app/globals.css
View File

@@ -9,8 +9,8 @@
--foreground: #00120ae6;; --foreground: #00120ae6;;
--primary-cta: #15ad59;; --primary-cta: #15ad59;;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;;
--accent: #e2e2e2;; --accent: #9ca3af;;
--background-accent: #c4c4c4;; --background-accent: #e5e7eb;;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -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-lato), 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-lato), 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 { Lato } 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 lato = Lato({ const playfairDisplay = Playfair_Display({
variable: "--font-lato", variable: "--font-playfair-display",
subsets: ["latin"], subsets: ["latin"],
weight: ["100", "300", "400", "700", "900"], });
const roboto = Roboto({
variable: "--font-roboto",
subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -49,7 +54,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={lato.variable} className={`${playfairDisplay.variable} ${roboto.variable}`}
> >
<Tag /> <Tag />
{children} {children}