development/9039d898-bcec-4ef3-b6cb-ecca78873963
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: development:version_1
Branches Tags
development:main development:version_4 development:version_3 development:version_2 development:version_1
...
pull from: development:version_2
Branches Tags
development:main development:version_4 development:version_3 development:version_2 development:version_1

2 Commits
version_1 ... version_2

Author SHA1 Message Date
development
28bcca2694 Update src/app/layout.tsx 2025-12-27 04:54:15 +00:00
development
b263d8ed7c Update src/app/globals.css 2025-12-27 04:54:14 +00:00
2 changed files with 13 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: #ffffff;; --background: #080000;
--card: #fafafa;; --card: #1e0d0d;
--foreground: #000000;; --foreground: #ffe6e6;
--primary-cta: #9933ff;; --primary-cta: #ff7a7a;
--secondary-cta: #ffffff;; --secondary-cta: #1e0909;
--accent: #e5e5e5;; --accent: #7b4242;
--background-accent: #f5f5f5;; --background-accent: #65292c;
/* 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);
@@ -495,7 +495,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-fraunces), sans-serif; font-family: var(--font-inter), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-fraunces), 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 type { Metadata } from "next";
import { Fraunces } from "next/font/google"; import { Inter } 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 fraunces = Fraunces({ const inter = Inter({
variable: "--font-fraunces", variable: "--font-inter",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -46,7 +46,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={fraunces.variable} className={inter.variable}
> >
<Tag /> <Tag />
{children} {children}