development/c1ee887e-dc52-43e6-bf64-fe202d450408
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

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

4 Commits
version_2 ... main

Author SHA1 Message Date
development
f166ffdff0 Merge version_3 into main 
Merge version_3 into main
 2026-01-08 20:24:47 +00:00
development
94998f3f90 Update src/app/layout.tsx 2026-01-08 20:24:42 +00:00
development
185ad4a730 Update src/app/globals.css 2026-01-08 20:24:41 +00:00
development
cdff55eee7 Merge version_2 into main 
Merge version_2 into main
 2026-01-08 20:20:11 +00:00
2 changed files with 14 additions and 13 deletions
Expand all files Collapse all files

18
src/app/globals.css
View File

@@ -4,13 +4,13 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
--background: #0a0a0a;; --background: #2d2416;;
--card: #1a1a1a;; --card: #3d3226;;
--foreground: #ffffffe6;; --foreground: #f5e6d3;;
--primary-cta: #e6e6e6;; --primary-cta: #d4845c;;
--secondary-cta: #1a1a1a;; --secondary-cta: #c9a876;;
--accent: #737373;; --accent: #e8b369;;
--background-accent: #737373;; --background-accent: #8b6f47;;
/* 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);
@@ -501,7 +501,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-dm-sans), sans-serif; font-family: var(--font-prata), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -514,5 +514,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-dm-sans), sans-serif; font-family: var(--font-prata), sans-serif;
} }

9
src/app/layout.tsx
View File

@@ -1,11 +1,12 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { DM_Sans } from "next/font/google"; import { Prata } 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 dmSans = DM_Sans({ const prata = Prata({
variable: "--font-dm-sans", subsets: ["latin"], variable: "--font-prata", subsets: ["latin"],
weight: ["400"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -38,7 +39,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={dmSans.variable} className={prata.variable}
> >
<Tag /> <Tag />
{children} {children}