development/1037cfa6-1220-4959-b72b-25af27f8042e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: development:version_3
Branches Tags
development:main development:version_14 development:version_13 development:version_12 development:version_11 development:version_10 development:version_9 development:version_8 development:version_7 development:version_6 development:version_5 development:version_4 development:version_3 development:version_2 development:version_1
...
pull from: development:version_5
Branches Tags
development:main development:version_14 development:version_13 development:version_12 development:version_11 development:version_10 development:version_9 development:version_8 development:version_7 development:version_6 development:version_5 development:version_4 development:version_3 development:version_2 development:version_1

4 Commits
version_3 ... version_5

Author SHA1 Message Date
development
1c4074af39 Update src/app/globals.css 2025-12-28 13:46:16 +00:00
development
3c6750625b Update src/app/page.tsx 2025-12-28 13:44:29 +00:00
development
421468d924 Update src/app/layout.tsx 2025-12-28 13:44:28 +00:00
development
339880a66a Update src/app/globals.css 2025-12-28 13:44:27 +00:00
3 changed files with 12 additions and 12 deletions
Expand all files Collapse all files

10
src/app/globals.css
View File

@@ -7,10 +7,10 @@
--background: #ffffff;; --background: #ffffff;;
--card: #fafafa;; --card: #fafafa;;
--foreground: #000000;; --foreground: #000000;;
--primary-cta: #ff6600;; --primary-cta: #409fff;;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;;
--accent: #e5e5e5;; --accent: #c7e2fc;;
--background-accent: #f5f5f5;; --background-accent: #9bcfff;;
/* 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-plus-jakarta-sans), 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-plus-jakarta-sans), 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 { Plus_Jakarta_Sans } 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 plusJakartaSans = Plus_Jakarta_Sans({ const inter = Inter({
variable: "--font-plus-jakarta-sans", variable: "--font-inter",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -35,7 +35,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={plusJakartaSans.variable} className={inter.variable}
> >
<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 NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline'; import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';