mirror of
https://github.com/i701/sarlink-portal.git
synced 2025-07-02 03:38:22 +00:00
fix: correct font variable usage and improve type handling in dynamic filter
All checks were successful
Build and Push Docker Images / Build and Push Docker Images (push) Successful in 7m18s
All checks were successful
Build and Push Docker Images / Build and Push Docker Images (push) Successful in 7m18s
This commit is contained in:
@ -5,6 +5,7 @@
|
||||
@custom-variant dark (&:is(.dark *));
|
||||
|
||||
@theme inline {
|
||||
--font-bokor: var(--font-bokor);
|
||||
--font-barlow: var(--font-barlow);
|
||||
--font-mono: var(--font-mono);
|
||||
--radius-sm: calc(var(--radius) - 4px);
|
||||
|
@ -1,8 +1,8 @@
|
||||
import { ThemeProvider } from "@/providers/theme-provider";
|
||||
import { Provider } from "jotai";
|
||||
import { ThemeProvider } from "@/providers/theme-provider";
|
||||
|
||||
import type { Metadata } from "next";
|
||||
import { Barlow } from "next/font/google";
|
||||
import { Barlow, Bokor } from "next/font/google";
|
||||
import NextTopLoader from "nextjs-toploader";
|
||||
import { Toaster } from "sonner";
|
||||
import "./globals.css";
|
||||
@ -16,6 +16,12 @@ const barlow = Barlow({
|
||||
variable: "--font-barlow",
|
||||
});
|
||||
|
||||
const bokor = Bokor({
|
||||
subsets: ["latin"],
|
||||
weight: ["400"],
|
||||
variable: "--font-bokor",
|
||||
});
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "SAR Link Portal",
|
||||
description: "Sarlink Portal",
|
||||
@ -29,7 +35,7 @@ export default async function RootLayout({
|
||||
const session = await getServerSession(authOptions);
|
||||
return (
|
||||
<html lang="en" suppressHydrationWarning>
|
||||
<body className={`${barlow.variable} antialiased font-sans bg-gray-100 dark:bg-black`}>
|
||||
<body className={`${barlow.variable} ${bokor.variable} antialiased font-sans bg-gray-100 dark:bg-black`}>
|
||||
<AuthProvider session={session || undefined}>
|
||||
<Provider>
|
||||
<NextTopLoader color="#f49d1b" showSpinner={false} zIndex={9999} />
|
||||
|
Reference in New Issue
Block a user