Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: font #135

Merged
merged 1 commit into from
Jun 20, 2024
Merged

Fix: font #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/app/(app)/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { getUserTeams } from '@/services/database/team';
import '@/theme/app.css';
import '@/theme/globals.css';
import { Metadata } from 'next';
import { Mulish } from 'next/font/google';
import { Inter } from 'next/font/google';
import Providers from './providers';

export const dynamic = 'force-dynamic';
Expand Down Expand Up @@ -48,10 +48,10 @@ export const metadata: Metadata = {
},
};

const mulish = Mulish({
const inter = Inter({
subsets: ['latin'],
weight: ['400', '500', '600', '700'],
variable: '--font-mulish',
variable: '--font-inter',
});

export default async function RootLayout({ children }: Props) {
Expand All @@ -63,7 +63,7 @@ export default async function RootLayout({ children }: Props) {
return (
<html lang="en">
<body
className={`flex flex-col font-sans overflow-x-hidden ${mulish.variable} font-mulish`}
className={`flex flex-col font-sans overflow-x-hidden ${inter.variable} font-inter`}
>
<Providers>
<Header teams={teams} user={session?.user} />
Expand Down
2 changes: 1 addition & 1 deletion tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = {
...defaultTheme.screens,
},
fontFamily: {
mulish: 'var(--font-mulish)',
inter: 'var(--font-inter)',
},
extends: {
typography: ({ theme }) => ({
Expand Down
Loading