development/70643d56-b39a-4fa4-b60a-fce7c0e7b6f6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #1

Merged
development merged 3 commits from version_2 into main 2026-01-21 17:23:37 +00:00
Conversation 0 Commits 3 Files Changed 3 +32 -32
3 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/app/globals.css
View File

@@ -4,21 +4,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1c1c1c;;
--secondary-cta: #ffffff;;
--accent: #15479c;;
--background-accent: #a8cce8;; */
/* --background: #010912;;
--card: #152840;;
--foreground: #e6f0ff;;
--primary-cta: #cee7ff;;
--secondary-cta: #0e1a29;;
--accent: #3f5c79;;
--background-accent: #004a93;; */
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1c1c1c;;
--secondary-cta: #ffffff;;
--accent: #15479c;;
--background-accent: #a8cce8;;
--background: #010912;;
--card: #152840;;
--foreground: #e6f0ff;;
--primary-cta: #cee7ff;;
--secondary-cta: #0e1a29;;
--accent: #3f5c79;;
--background-accent: #004a93;;
/* 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-noto-sans), sans-serif;
font-family: var(--font-space-grotesk), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -522,5 +522,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-noto-sans), sans-serif;
font-family: var(--font-space-grotesk), sans-serif;
}

10
src/app/layout.tsx
View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next";
import { Noto_Sans } from "next/font/google";
import { Space_Grotesk } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const notoSans = Noto_Sans({
variable: "--font-noto-sans", subsets: ["latin"],
const spaceGrotesk = Space_Grotesk({
variable: "--font-space-grotesk", subsets: ["latin"],
});
export const metadata: Metadata = {
@@ -30,7 +30,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={notoSans.variable}
className={spaceGrotesk.variable}
>
<Tag />
{children}
@@ -1256,4 +1256,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

22
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -15,16 +15,16 @@ import { Zap, Calendar } from "lucide-react";
export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="reveal-blur"
borderRadius="sharp"
defaultButtonVariant="icon-arrow"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="medium"
sizing="mediumLarge"
background="radialGradient"
cardStyle="layered-gradient"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="layered"
headingFontWeight="light"
sizing="largeSizeMediumTitles"
background="aurora"
cardStyle="glass-depth"
primaryButtonStyle="inset-glow"
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
@@ -236,4 +236,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}