development/7e50d801-8483-4980-b525-20fe59921586
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:main
Branches Tags
development:main development:version_2 development:version_1

4 Commits
version_1 ... main

Author SHA1 Message Date
development
e3fca71de0 Merge version_2 into main 
Merge version_2 into main
 2026-01-14 20:52:12 +00:00
development
55736ccf4f Update src/app/page.tsx 2026-01-14 20:52:08 +00:00
development
a4fb51c1e6 Update src/app/layout.tsx 2026-01-14 20:52:07 +00:00
development
a6603c80e2 Update src/app/globals.css 2026-01-14 20:52:06 +00:00
3 changed files with 22 additions and 22 deletions
Expand all files Collapse all files

28
src/app/globals.css
View File

@@ -4,21 +4,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5faff;;
--card: #f1f8ff;;
--foreground: #001122;;
--primary-cta: #15479c;;
/* --background: #fef5f3;;
--card: #ffffff;;
--foreground: #1a1a1a;;
--primary-cta: #ff6b9d;;
--secondary-cta: #ffffff;;
--accent: #a8cce8;;
--background-accent: #7ba3cf;; */
--accent: #ffa500;;
--background-accent: #ffe4b5;; */
--background: #f5faff;;
--card: #f1f8ff;;
--foreground: #001122;;
--primary-cta: #15479c;;
--background: #fef5f3;;
--card: #ffffff;;
--foreground: #1a1a1a;;
--primary-cta: #ff6b9d;;
--secondary-cta: #ffffff;;
--accent: #a8cce8;;
--background-accent: #7ba3cf;;
--accent: #ffa500;;
--background-accent: #ffe4b5;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -509,7 +509,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-prata), sans-serif;
font-family: var(--font-poppins), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -522,5 +522,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-prata), sans-serif;
font-family: var(--font-poppins), sans-serif;
}

12
src/app/layout.tsx
View File

@@ -1,12 +1,12 @@
import type { Metadata } from "next";
import { Prata } from "next/font/google";
import { Poppins } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const prata = Prata({
variable: "--font-prata", subsets: ["latin"],
weight: ["400"],
const poppins = Poppins({
variable: "--font-poppins", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export const metadata: Metadata = {
@@ -35,7 +35,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={prata.variable}
className={poppins.variable}
>
<Tag />
{children}
@@ -1261,4 +1261,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';
@@ -224,4 +224,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}