fix: font

Signed-off-by: Homing So <[email protected]>
hominsu · Jan 1, 2024 · 5aecae9 · 5aecae9
1 parent d4859a8
commit 5aecae9
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 10 deletions.
diff --git a/web/.eslintignore b/web/.eslintignore
@@ -1,2 +1,2 @@
 node_modules
-.eslintrc.js
+.eslintrc.json
diff --git a/web/.eslintrc.json b/web/.eslintrc.json
@@ -16,7 +16,7 @@
   "settings": {
     "tailwindcss": {
       "callees": ["cn", "cva"],
-      "config": "tailwind.config.ts"
+      "config": "tailwind.config.cjs"
     },
     "next": {
       "rootDir": ["."]

diff --git a/web/app/layout.tsx b/web/app/layout.tsx
@@ -74,9 +74,7 @@ export default function RootLayout({ children }: RootLayoutProps) {
   return (
     <>
       <html lang="en" suppressHydrationWarning>
-        <body
-          className={cn('min-h-screen bg-background font-sans antialiased', fontSans.className)}
-        >
+        <body className={cn('min-h-screen bg-background font-sans antialiased', fontSans.variable)}>
           <ThemeProvider
             attribute="class"
             defaultTheme="system"

diff --git a/web/components.json b/web/components.json
@@ -4,7 +4,7 @@
   "rsc": true,
   "tsx": true,
   "tailwind": {
-    "config": "tailwind.config.ts",
+    "config": "tailwind.config.cjs",
     "css": "styles/globals.css",
     "baseColor": "zinc",
     "cssVariables": false

diff --git a/web/postcss.config.js → web/postcss.config.cjs b/web/postcss.config.js → web/postcss.config.cjs
diff --git a/web/prettier.config.js → web/prettier.config.cjs b/web/prettier.config.js → web/prettier.config.cjs
diff --git a/web/tailwind.config.ts → web/tailwind.config.cjs b/web/tailwind.config.ts → web/tailwind.config.cjs
@@ -1,9 +1,7 @@
-import type { Config } from 'tailwindcss'
-
 const { fontFamily } = require('tailwindcss/defaultTheme')
 
 /** @type {import('tailwindcss').Config} */
-const config: Config = {
+module.exports = {
   darkMode: ['class'],
   content: ['./app/**/*.{js,ts,jsx,tsx,mdx}', './components/**/*.{js,ts,jsx,tsx,mdx}'],
   theme: {
@@ -77,4 +75,3 @@ const config: Config = {
   },
   plugins: [require('tailwindcss-animate')],
 }
-export default config