bender/26875581-3684-4968-8bee-a3a32daa7325
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_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_5
Branches Tags
bender:main bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

7 Commits
version_2 ... version_5

Author SHA1 Message Date
bender
694c300287 Update src/app/styles/base.css 2026-02-27 13:51:14 +00:00
bender
3363a711db Update src/app/layout.tsx 2026-02-27 13:51:13 +00:00
bender
9d45aa9dc5 Merge version_3 into main 
Merge version_3 into main
 2026-02-27 13:39:29 +00:00
bender
0ef3c2ef0f Update src/app/styles/variables.css 2026-02-27 13:39:25 +00:00
bender
4f56070dbe Update src/app/page.tsx 2026-02-27 13:39:24 +00:00
bender
bf06d5d28b Update src/app/layout.tsx 2026-02-27 13:39:24 +00:00
bender
5caa6b6be0 Merge version_2 into main 
Merge version_2 into main
 2026-02-27 13:37:39 +00:00
4 changed files with 23 additions and 22 deletions
Expand all files Collapse all files

11
src/app/layout.tsx
View File

@@ -1,11 +1,12 @@
import type { Metadata } from "next";
import { Rubik } from "next/font/google";
import { IBM_Plex_Sans } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const rubik = Rubik({
variable: "--font-rubik", subsets: ["latin"],
const ibmPlexSans = IBM_Plex_Sans({
variable: "--font-ibm-plex-sans", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700"],
});
export const metadata: Metadata = {
@@ -27,7 +28,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${rubik.variable} antialiased`}
className={`${ibmPlexSans.variable} antialiased`}
>
<Tag />
{children}
@@ -1402,4 +1403,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

2
src/app/page.tsx
View File

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

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-rubik), sans-serif;
font-family: var(--font-ibm-plex-sans), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-rubik), sans-serif;
font-family: var(--font-ibm-plex-sans), sans-serif;
}

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

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1f514c;;
--secondary-cta: #ffffff;;
--accent: #159c49;;
--background-accent: #a8e8ba;; */
/* --background: #020617;;
--card: #0f172a;;
--foreground: #e2e8f0;;
--primary-cta: #2d30f3;;
--secondary-cta: #041633;;
--accent: #1d4ed8;;
--background-accent: #1d4ed8;; */
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1f514c;;
--background: #020617;;
--card: #0f172a;;
--foreground: #e2e8f0;;
--primary-cta: #2d30f3;;
--primary-cta-text: #f5f5f5;;
--secondary-cta: #ffffff;;
--secondary-cta: #041633;;
--secondary-cta-text: #1c1c1c;;
--accent: #159c49;;
--background-accent: #a8e8ba;;
--accent: #1d4ed8;;
--background-accent: #1d4ed8;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);