bender/afd8f2b2-63f7-4507-bc24-5519af322672
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bender:version_1
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1
..
compare: bender:version_3
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1

5 Commits
version_1 ... version_3

Author SHA1 Message Date
bender
e44b066229 Update src/app/styles/variables.css 2026-03-06 16:28:55 +00:00
bender
1f9317c2eb Update src/app/layout.tsx 2026-03-06 16:28:54 +00:00
bender
75b885f922 Merge version_2 into main 
Merge version_2 into main
 2026-03-06 16:18:45 +00:00
bender
0ed34ee202 Update src/app/styles/base.css 2026-03-06 16:18:40 +00:00
bender
f9b90e7894 Update src/app/layout.tsx 2026-03-06 16:18:38 +00:00
3 changed files with 9 additions and 17 deletions
Expand all files Collapse all files

10
src/app/layout.tsx
View File

@@ -1,15 +1,9 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
@@ -39,9 +33,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} antialiased`}
>
<body className={`${inter.variable} antialiased`}>
<Tag />
{children}

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

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-inter), sans-serif;
font-family: var(--font-kanit), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-inter), sans-serif;
font-family: var(--font-kanit), sans-serif;
}

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

@@ -11,14 +11,14 @@
--background-accent: #ffffff; */
--background: #ffffff;
--card: #f9f9f9;
--foreground: #120006e6;
--primary-cta: #e63946;
--card: #f6f7f4;
--foreground: #080908;
--primary-cta: #0e3a29;
--primary-cta-text: #ffffff;
--secondary-cta: #f9f9f9;
--secondary-cta: #e7eecd;
--secondary-cta-text: #120006e6;
--accent: #e2e2e2;
--background-accent: #c4c4c4;
--accent: #35c18b;
--background-accent: #ecebe4;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);