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

Merge version_3 into main #2

Merged
development merged 2 commits from version_3 into main 2026-01-08 20:24:48 +00:00
Conversation 0 Commits 2 Files Changed 2 +14 -13
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/globals.css
View File

@@ -4,13 +4,13 @@
/* Base units */
/* --vw is set by ThemeProvider */
--background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #ffffffe6;;
--primary-cta: #e6e6e6;;
--secondary-cta: #1a1a1a;;
--accent: #737373;;
--background-accent: #737373;;
--background: #2d2416;;
--card: #3d3226;;
--foreground: #f5e6d3;;
--primary-cta: #d4845c;;
--secondary-cta: #c9a876;;
--accent: #e8b369;;
--background-accent: #8b6f47;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -501,7 +501,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-dm-sans), sans-serif;
font-family: var(--font-prata), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -514,5 +514,5 @@ h3,
h4,
h5,
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 { DM_Sans } from "next/font/google";
import { Prata } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
const prata = Prata({
variable: "--font-prata", subsets: ["latin"],
weight: ["400"],
});
export const metadata: Metadata = {
@@ -38,7 +39,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={dmSans.variable}
className={prata.variable}
>
<Tag />
{children}