development/237d7bda-c430-440f-8dcb-74b9d2ee5611
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #1

Merged
development merged 2 commits from version_2 into main 2025-12-28 07:21:47 +00:00
Conversation 0 Commits 2 Files Changed 2 +13 -14
2 changed files with 13 additions and 14 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: #fff8f5;;
--card: #fff0eb;;
--foreground: #3d2c29;;
--primary-cta: #e8a090;;
--secondary-cta: #ffffff;;
--accent: #f5d5cc;;
--background-accent: #f0c4b8;;
--background: #080000;
--card: #1e0d0d;
--foreground: #ffe6e6;
--primary-cta: #ff7a7a;
--secondary-cta: #1e0909;
--accent: #7b4242;
--background-accent: #65292c;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -495,7 +495,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-merriweather), sans-serif;
font-family: var(--font-inter), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-merriweather), sans-serif;
font-family: var(--font-inter), sans-serif;
}

9
src/app/layout.tsx
View File

@@ -1,13 +1,12 @@
import type { Metadata } from "next";
import { Merriweather } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const merriweather = Merriweather({
variable: "--font-merriweather",
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
weight: ["300", "400", "700", "900"],
});
export const metadata: Metadata = {
@@ -35,7 +34,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={merriweather.variable}
className={inter.variable}
>
<Tag />
{children}