development/86d5211f-f5c1-4474-9ebc-2037c1470717
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_3 development:version_2 development:version_1
...
pull from: development:main
Branches Tags
development:main development:version_3 development:version_2 development:version_1

6 Commits
version_1 ... main

Author SHA1 Message Date
development
e527831461 Merge version_3 into main 
Merge version_3 into main
 2026-01-08 10:10:14 +00:00
development
81ba384d0d Update src/app/globals.css 2026-01-08 10:10:08 +00:00
development
e5b0ff7062 Merge version_2 into main 
Merge version_2 into main
 2026-01-07 15:17:33 +00:00
development
9c5dc834d2 Update src/app/page.tsx 2026-01-07 15:17:28 +00:00
development
9ccd036379 Update src/app/layout.tsx 2026-01-07 15:17:27 +00:00
development
bdc148eeda Update src/app/globals.css 2026-01-07 15:17:26 +00:00
3 changed files with 16 additions and 16 deletions
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: #fbfaff;;
--card: #f7f5ff;;
--foreground: #0f0022;;
--primary-cta: #8b5cf6;;
--secondary-cta: #ffffff;;
--accent: #d8cef5;;
--background-accent: #c4a8f9;;
--background: #020006;;
--card: #1d0d1d;;
--foreground: #f0e6ff;;
--primary-cta: #b366ff;;
--secondary-cta: #1a0a29;;
--accent: #59437b;;
--background-accent: #6b28d9;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -501,7 +501,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-fira-code), sans-serif;
font-family: var(--font-inter), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -514,5 +514,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-fira-code), sans-serif;
font-family: var(--font-inter), sans-serif;
}

10
src/app/layout.tsx
View File

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

4
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
@@ -189,4 +189,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}