development/8d001703-85e9-4dca-bac0-0f57be73840e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

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

12 Commits
version_2 ... main

Author SHA1 Message Date
development
2ea687a330 Merge version_5 into main 
Merge version_5 into main
 2025-12-27 13:08:33 +00:00
development
023fff2798 Update src/app/page.tsx 2025-12-27 13:08:28 +00:00
development
acd74a2011 Update src/app/layout.tsx 2025-12-27 13:08:27 +00:00
development
0c6928b45e Update src/app/globals.css 2025-12-27 13:08:26 +00:00
development
e32a268b88 Merge version_4 into main 
Merge version_4 into main
 2025-12-27 13:03:41 +00:00
development
9d28d16935 Update src/app/layout.tsx 2025-12-27 13:03:36 +00:00
development
3ada86d143 Update src/app/globals.css 2025-12-27 13:03:35 +00:00
development
5311ebdc6d Merge version_3 into main 
Merge version_3 into main
 2025-12-27 13:01:50 +00:00
development
efb99c701d Update src/app/page.tsx 2025-12-27 13:01:45 +00:00
development
e1181b78f8 Update src/app/layout.tsx 2025-12-27 13:01:44 +00:00
development
cd9e5d96b4 Update src/app/globals.css 2025-12-27 13:01:43 +00:00
development
cbcc8ec146 Merge version_2 into main 
Merge version_2 into main
 2025-12-27 12:51:03 +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: #080000; --background: #ffffff;
--card: #1e0d0d; --card: #fcfcfc;
--foreground: #ffe6e6; --foreground: #00120ae6;
--primary-cta: #ff7a7a; --primary-cta: #15ad59;
--secondary-cta: #1e0909; --secondary-cta: #ffffff;
--accent: #7b4242; --accent: #15ad59;
--background-accent: #65292c; --background-accent: #c4c4c4;
/* 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-inter), sans-serif; font-family: var(--font-inter-tight), 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-inter), sans-serif; font-family: var(--font-inter-tight), sans-serif;
} }

8
src/app/layout.tsx
View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Inter } from "next/font/google"; import { Epilogue } 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 inter = Inter({ const epilogue = Epilogue({
variable: "--font-inter", variable: "--font-epilogue",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -38,7 +38,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${inter.variable} antialiased`} className={`${epilogue.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}