development/9039d898-bcec-4ef3-b6cb-ecca78873963
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: development:version_1
Branches Tags
development:main development:version_4 development:version_3 development:version_2 development:version_1
..
compare: development:main
Branches Tags
development:main development:version_4 development:version_3 development:version_2 development:version_1

10 Commits
version_1 ... main

Author SHA1 Message Date
development
6a6e5a05e0 Merge version_4 into main 
Merge version_4 into main
 2025-12-27 05:03:00 +00:00
development
9357dc5b31 Update src/app/page.tsx 2025-12-27 05:02:55 +00:00
development
c55b3d36d5 Update src/app/globals.css 2025-12-27 05:02:54 +00:00
development
f2bb85e876 Merge version_3 into main 
Merge version_3 into main
 2025-12-27 05:00:17 +00:00
development
8982d8aa22 Update src/app/page.tsx 2025-12-27 05:00:12 +00:00
development
69908ed41c Update src/app/layout.tsx 2025-12-27 05:00:11 +00:00
development
321bf80e97 Update src/app/globals.css 2025-12-27 05:00:10 +00:00
development
0ff42c2196 Merge version_2 into main 
Merge version_2 into main
 2025-12-27 04:54:20 +00:00
development
28bcca2694 Update src/app/layout.tsx 2025-12-27 04:54:15 +00:00
development
b263d8ed7c Update src/app/globals.css 2025-12-27 04:54:14 +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: #ffffff;;
--card: #fafafa;;
--foreground: #000000;;
--primary-cta: #9933ff;;
--secondary-cta: #ffffff;;
--accent: #e5e5e5;;
--background-accent: #f5f5f5;;
--background: #ffffff;
--card: #fcfcfc;
--foreground: #00120ae6;
--primary-cta: #15ad59;
--secondary-cta: #ffffff;
--accent: #e2e2e2;
--background-accent: #c4c4c4;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -495,7 +495,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-fraunces), sans-serif;
font-family: var(--font-inter-tight), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-fraunces), sans-serif;
font-family: var(--font-inter-tight), sans-serif;
}

10
src/app/layout.tsx
View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next";
import { Fraunces } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const fraunces = Fraunces({
variable: "--font-fraunces",
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
@@ -46,7 +46,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={fraunces.variable}
className={inter.variable}
>
<Tag />
{children}
@@ -1272,4 +1272,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 NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
@@ -232,4 +232,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}