development/e6f7ffc7-710c-4cc3-8b2e-526b748c7de0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #2

Merged
development merged 3 commits from version_3 into main 2025-12-28 02:40:01 +00:00
Conversation 0 Commits 3 Files Changed 3 +16 -16
3 changed files with 16 additions and 16 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: #fafafa;;
--card: #f4f4f5;;
--foreground: #27272a;;
--primary-cta: #3f3f46;;
--secondary-cta: #ffffff;;
--accent: #facc15;;
--background-accent: #eab308;;
--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-inter-tight), sans-serif;
font-family: var(--font-ibm-plex-sans), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-inter-tight), sans-serif;
font-family: var(--font-ibm-plex-sans), sans-serif;
}

12
src/app/layout.tsx
View File

@@ -1,13 +1,13 @@
import type { Metadata } from "next";
import { Inter_Tight } from "next/font/google";
import { IBM_Plex_Sans } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const interTight = Inter_Tight({
variable: "--font-inter-tight",
const ibmPlexSans = IBM_Plex_Sans({
variable: "--font-ibm-plex-sans",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
weight: ["100", "200", "300", "400", "500", "600", "700"],
});
export const metadata: Metadata = {
@@ -47,7 +47,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${interTight.variable} antialiased`}
className={`${ibmPlexSans.variable} antialiased`}
>
<Tag />
{children}
@@ -1273,4 +1273,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

2
src/app/page.tsx
View File

@@ -206,4 +206,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}