development/ba12cd20-8615-4b6b-87fb-518ebd092bb5
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_2 development:version_1
...
pull from: development:version_2
Branches Tags
development:main development:version_2 development:version_1

3 Commits
version_1 ... version_2

Author SHA1 Message Date
development
aedd87ccc7 Update src/app/page.tsx 2025-12-26 00:47:09 +00:00
development
3ea66c4393 Update src/app/layout.tsx 2025-12-26 00:47:09 +00:00
development
e68dea963c Update src/app/globals.css 2025-12-26 00:47:08 +00:00
3 changed files with 23 additions and 17 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: #f8f9fa;; --background: #080000;
--card: #f0f2f5;; --card: #1e0d0d;
--foreground: #1e293b;; --foreground: #ffe6e6;
--primary-cta: #1e3a8a;; --primary-cta: #ff7a7a;
--secondary-cta: #ffffff;; --secondary-cta: #1e0909;
--accent: #fbbf24;; --accent: #7b4242;
--background-accent: #d97706;; --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-prata), sans-serif; font-family: var(--font-inter and --font-merriweather), 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-prata), sans-serif; font-family: var(--font-inter and --font-merriweather), sans-serif;
} }

16
src/app/layout.tsx
View File

@@ -1,13 +1,19 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Prata } from "next/font/google"; import { Inter } from "next/font/google";
import { Merriweather } 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 prata = Prata({ const inter = Inter({
variable: "--font-prata", variable: "--font-inter",
subsets: ["latin"], subsets: ["latin"],
weight: ["400"], });
const merriweather = Merriweather({
variable: "--font-merriweather",
subsets: ["latin"],
weight: ["300", "400", "700", "900"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -41,7 +47,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${prata.variable} antialiased`} className={`${inter.variable} ${merriweather.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}

2
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client" "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleMinimal from "@/components/navbar/NavbarStyleMinimal"; import NavbarStyleMinimal from "@/components/navbar/NavbarStyleMinimal";