development/a29ab6da-8db9-469a-a344-8bae49489c44
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_8 development:version_7 development:version_5 development:version_4 development:version_3 development:version_2 development:version_1
...
pull from: development:version_7
Branches Tags
development:main development:version_8 development:version_7 development:version_5 development:version_4 development:version_3 development:version_2 development:version_1

10 Commits
version_1 ... version_7

Author SHA1 Message Date
development
92925e320c Update src/app/globals.css 2025-12-28 11:28:23 +00:00
development
4f755ad232 Update src/app/globals.css 2025-12-28 11:26:07 +00:00
development
3cf4ba47ee Update src/app/page.tsx 2025-12-28 11:19:10 +00:00
development
14e56b64d1 Update src/app/globals.css 2025-12-28 11:19:09 +00:00
development
0d63de4f15 Update src/app/page.tsx 2025-12-28 11:10:06 +00:00
development
27f37c6fb3 Update src/app/layout.tsx 2025-12-28 11:10:05 +00:00
development
1151b5462e Update src/app/globals.css 2025-12-28 11:10:04 +00:00
development
6deeddf32d Update src/app/globals.css 2025-12-28 11:08:13 +00:00
development
374f3abbc7 Update src/app/layout.tsx 2025-12-28 11:06:10 +00:00
development
e90817957b Update src/app/globals.css 2025-12-28 11:06:09 +00:00
3 changed files with 14 additions and 14 deletions
Expand all files Collapse all files

12
src/app/globals.css
View File

@@ -4,12 +4,12 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
--background: #ffffff;; --background: #f5f5f5;;
--card: #fcfcfc;; --card: #fcfcfc;;
--foreground: #000612e6;; --foreground: #000000e6;;
--primary-cta: #15479c;; --primary-cta: #1a1a1a;;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;;
--accent: #e2e2e2;; --accent: #facc15;;
--background-accent: #c4c4c4;; --background-accent: #c4c4c4;;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
@@ -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-ibm-plex-sans), 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-ibm-plex-sans), sans-serif;
} }

10
src/app/layout.tsx
View File

@@ -1,13 +1,13 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { DM_Serif_Display } from "next/font/google"; import { IBM_Plex_Sans } 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 ibmPlexSans = IBM_Plex_Sans({
variable: "--font-dm-serif-display", variable: "--font-ibm-plex-sans",
subsets: ["latin"], subsets: ["latin"],
weight: ["400"], weight: ["100", "200", "300", "400", "500", "600", "700"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -52,7 +52,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={dmSerifDisplay.variable} className={ibmPlexSans.variable}
> >
<Tag /> <Tag />
{children} {children}

2
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client" "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline'; import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';