development/d37c8f57-24b4-4bec-b998-5d24365a89bf
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

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

10 Commits
version_3 ... main

Author SHA1 Message Date
development
c67bc73e9a Merge version_7 into main 
Merge version_7 into main
 2026-01-06 06:26:11 +00:00
development
1848446732 Update src/app/layout.tsx 2026-01-06 06:26:06 +00:00
development
7cd676f1b6 Update src/app/globals.css 2026-01-06 06:26:05 +00:00
development
02607d1cdf Merge version_6 into main 
Merge version_6 into main
 2026-01-05 08:38:37 +00:00
development
a045e85eb0 Update src/app/globals.css 2026-01-05 08:38:32 +00:00
development
9d71243362 Merge version_4 into main 
Merge version_4 into main
 2026-01-05 00:43:46 +00:00
development
408d465473 Update src/app/page.tsx 2026-01-05 00:43:42 +00:00
development
62e31728f0 Update src/app/layout.tsx 2026-01-05 00:43:41 +00:00
development
283046f4df Merge version_3 into main 
Merge version_3 into main
 2026-01-05 00:40:35 +00:00
development
81fdda17c4 Merge version_2 into main 
Merge version_2 into main
 2026-01-05 00:18:18 +00:00
3 changed files with 15 additions and 16 deletions
Expand all files Collapse all files

18
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: #0a0a0a;;
--card: #fafafa;; --card: #1a1a1a;;
--foreground: #000000;; --foreground: #ffffffe6;;
--primary-cta: #ff8c42;; --primary-cta: #e6e6e6;;
--secondary-cta: #ffffff;; --secondary-cta: #1a1a1a;;
--accent: #e5e5e5;; --accent: #737373;;
--background-accent: #f5f5f5;; --background-accent: #737373;;
/* 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);
@@ -495,7 +495,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-dm-serif-display), sans-serif; font-family: var(--font-mulish), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-dm-serif-display), sans-serif; font-family: var(--font-mulish), sans-serif;
} }

11
src/app/layout.tsx
View File

@@ -1,13 +1,12 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { DM_Serif_Display } from "next/font/google"; import { Mulish } 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 dmSerifDisplay = DM_Serif_Display({ const mulish = Mulish({
variable: "--font-dm-serif-display", variable: "--font-mulish",
subsets: ["latin"], subsets: ["latin"],
weight: ["400"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -52,7 +51,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={dmSerifDisplay.variable} className={mulish.variable}
> >
<Tag /> <Tag />
{children} {children}
@@ -1278,4 +1277,4 @@ export default function RootLayout({
</ServiceWrapper> </ServiceWrapper>
</html> </html>
); );
} }

2
src/app/page.tsx
View File

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