Skip to content

Commit

Permalink
Merge pull request #135 from premieroctet/fix/font-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
quentingrchr authored Jun 20, 2024
2 parents 02a8374 + f148d3c commit 602d48b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/app/(app)/layout.tsx
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
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

0 comments on commit 602d48b

Please sign in to comment.