development/b9ac5245-aad9-4b81-9311-1bc0b417d5dc
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: development:version_1
Branches Tags
development:main development:version_4 development:version_2 development:version_3 development:version_1
...
pull from: development:main
Branches Tags
development:main development:version_4 development:version_2 development:version_3 development:version_1

7 Commits
version_1 ... main

Author SHA1 Message Date
development
8774300ce8 Merge version_4 into main 
Merge version_4 into main
 2026-01-22 21:23:07 +00:00
development
3e3474bd55 Update src/app/globals.css 2026-01-22 21:23:03 +00:00
development
0e4ef94518 Merge version_2 into main 
Merge version_2 into main
 2026-01-22 20:52:09 +00:00
development
d64ce3bee0 Update src/app/page.tsx 2026-01-22 20:52:04 +00:00
development
b119713c1c Update src/app/layout.tsx 2026-01-22 20:52:03 +00:00
development
4533e67c86 Update src/app/globals.css 2026-01-22 20:52:02 +00:00
development
537a122dae Merge version_1 into main 
Merge version_1 into main
 2026-01-22 20:48:23 +00:00
3 changed files with 20 additions and 20 deletions
Expand all files Collapse all files

28
src/app/globals.css
View File

@@ -4,21 +4,21 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #e3deea;; /* --background: #fafffb;;
--card: #ffffff;; --card: #f7fffa;;
--foreground: #1f2027;; --foreground: #001a0a;;
--primary-cta: #1f2027;; --primary-cta: #0a7039;;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;;
--accent: #627dc6;; --accent: #a8d9be;;
--background-accent: #627dc6;; */ --background-accent: #6bbf8e;; */
--background: #e3deea;; --background: #fafffb;;
--card: #ffffff;; --card: #f7fffa;;
--foreground: #1f2027;; --foreground: #001a0a;;
--primary-cta: #1f2027;; --primary-cta: #0a7039;;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;;
--accent: #627dc6;; --accent: #a8d9be;;
--background-accent: #627dc6;; --background-accent: #6bbf8e;;
/* 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);
@@ -578,7 +578,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-space-grotesk), 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;
@@ -591,5 +591,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-space-grotesk), sans-serif; font-family: var(--font-inter), sans-serif;
} }

10
src/app/layout.tsx
View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Space_Grotesk } 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 spaceGrotesk = Space_Grotesk({ const inter = Inter({
variable: "--font-space-grotesk", subsets: ["latin"], variable: "--font-inter", subsets: ["latin"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -37,7 +37,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${spaceGrotesk.variable} antialiased`} className={`${inter.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}
@@ -1263,4 +1263,4 @@ export default function RootLayout({
</ServiceWrapper> </ServiceWrapper>
</html> </html>
); );
} }

2
src/app/page.tsx
View File

@@ -181,4 +181,4 @@ export default function LandingPage() {
</div> </div>
</ThemeProvider> </ThemeProvider>
); );
} }