bender/e4e184ab-7656-499a-b238-5a376442868f
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #3

Merged
bender merged 1 commits from version_3 into main 2026-02-26 10:30:53 +00:00
Conversation 0 Commits 1 Files Changed 2 +14 -8
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/layout.tsx
View File

@@ -1,11 +1,8 @@
import type { Metadata } from "next";
import { Open_Sans } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Tech Club | Empowering Tech Enthusiasts Since 2018",
@@ -13,6 +10,15 @@ export const metadata: Metadata = {
keywords: ["computer club", "tech enthusiasts", "coding club", "student technology", "tech community"],
};
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -20,7 +26,7 @@ export default function RootLayout({
}>) {
return (
<html lang="en">
<body className={`${openSans.variable} antialiased`}>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}>
{children}
<script

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