development/8d001703-85e9-4dca-bac0-0f57be73840e
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-27 12:51:03 +00:00
Conversation 0 Commits 2 Files Changed 2 +13 -13
2 changed files with 13 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: #ffffff;;
--card: #fafafa;;
--foreground: #000000;;
--primary-cta: #0066ff;;
--secondary-cta: #ffffff;;
--accent: #e5e5e5;;
--background-accent: #f5f5f5;;
--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-noto-sans), 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-noto-sans), sans-serif;
font-family: var(--font-inter), sans-serif;
}

8
src/app/layout.tsx
View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next";
import { Noto_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const notoSans = Noto_Sans({
variable: "--font-noto-sans",
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
@@ -38,7 +38,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${notoSans.variable} antialiased`}
className={`${inter.variable} antialiased`}
>
<Tag />
{children}