development/624785bf-96b3-4437-85ec-4789639423dd
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:main
Branches Tags
development:main development:version_4 development:version_3 development:version_2 development:version_1

8 Commits
version_1 ... main

Author SHA1 Message Date
development
f7440f10cd Merge version_4 into main 
Merge version_4 into main
 2025-12-27 15:26:31 +00:00
development
c7a9c2006a Update src/app/page.tsx 2025-12-27 15:26:26 +00:00
development
979c11d9df Update src/app/layout.tsx 2025-12-27 15:26:25 +00:00
development
3227357d9a Merge version_3 into main 
Merge version_3 into main
 2025-12-27 15:13:05 +00:00
development
1e0e0056f5 Update src/app/page.tsx 2025-12-27 15:13:01 +00:00
development
7ee5033788 Update src/app/layout.tsx 2025-12-27 15:12:59 +00:00
development
ddf3ae6e40 Merge version_2 into main 
Merge version_2 into main
 2025-12-27 15:10:27 +00:00
development
c296288100 Update src/app/globals.css 2025-12-27 15:10:22 +00:00
3 changed files with 15 additions and 15 deletions
Expand all files Collapse all files

14
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: #000602;;
--card: #fcfcfc;; --card: #0d1d0d;;
--foreground: #001212e6;; --foreground: #e6ffe6;;
--primary-cta: #16d4f6;; --primary-cta: #1cde5d;;
--secondary-cta: #ffffff;; --secondary-cta: #0a1f0f;;
--accent: #e2e2e2;; --accent: #2e6841;;
--background-accent: #c4c4c4;; --background-accent: #0d6b32;;
/* 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);

10
src/app/layout.tsx
View File

@@ -1,13 +1,13 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Poppins } from "next/font/google"; import { IBM_Plex_Sans } 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 poppins = Poppins({ const ibmPlexSans = IBM_Plex_Sans({
variable: "--font-poppins", variable: "--font-ibm-plex-sans",
subsets: ["latin"], subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"], weight: ["100", "200", "300", "400", "500", "600", "700"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -48,7 +48,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={poppins.variable} className={ibmPlexSans.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 NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple'; import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';