bender/700bd58c-8019-4e19-9b7a-ddfc18bce3ae
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

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

4 Commits
version_2 ... version_3

Author SHA1 Message Date
bender
93ea5dce7f Update src/app/styles/variables.css 2026-03-02 22:59:28 +00:00
bender
af8f529260 Update src/app/styles/base.css 2026-03-02 22:59:27 +00:00
bender
d320e44fed Update src/app/layout.tsx 2026-03-02 22:59:27 +00:00
bender
fef832b78d Merge version_2 into main 
Merge version_2 into main
 2026-03-02 22:45:24 +00:00
3 changed files with 15 additions and 26 deletions
Expand all files Collapse all files

13
src/app/layout.tsx
View File

@@ -1,20 +1,9 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Public_Sans } from "next/font/google";
import { Halant } from "next/font/google";
import { Inter } 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 publicSans = Public_Sans({
variable: "--font-public-sans", subsets: ["latin"],
});
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({ const inter = Inter({
variable: "--font-inter", subsets: ["latin"], variable: "--font-inter", subsets: ["latin"],
}); });
@@ -37,7 +26,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${publicSans.variable} ${halant.variable} ${inter.variable} antialiased`} className={`${inter.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}

4
src/app/styles/base.css
View File

@@ -11,7 +11,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-public-sans), 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;
@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-public-sans), sans-serif; font-family: var(--font-inter), sans-serif;
} }

24
src/app/styles/variables.css
View File

@@ -3,22 +3,22 @@
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #ffffff;; /* --background: #ffffff;;
--card: #f8f9fa;; --card: #f9f9f9;;
--foreground: #0c1929;; --foreground: #120a00e6;;
--primary-cta: #1f7cff;; --primary-cta: #FF7B05;;
--secondary-cta: #ffffff;; --secondary-cta: #f9f9f9;;
--accent: #e0f0ff;; --accent: #e2e2e2;;
--background-accent: #1f7cff;; */ --background-accent: #FF7B05;; */
--background: #ffffff;; --background: #ffffff;;
--card: #f8f9fa;; --card: #f9f9f9;;
--foreground: #0c1929;; --foreground: #120a00e6;;
--primary-cta: #1f7cff;; --primary-cta: #FF7B05;;
--primary-cta-text: #ffffff;; --primary-cta-text: #ffffff;;
--secondary-cta: #ffffff;; --secondary-cta: #f9f9f9;;
--secondary-cta-text: #0c1929;; --secondary-cta-text: #0c1929;;
--accent: #e0f0ff;; --accent: #e2e2e2;;
--background-accent: #1f7cff;; --background-accent: #FF7B05;;
/* 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);