fix: wrong font settings

yilanboy · Nov 9, 2024 · cc31cb3 · cc31cb3
1 parent 141d8c9
commit cc31cb3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php
@@ -39,10 +39,9 @@ class="scroll-smooth"
   <link rel="icon" href="{{ asset('images/icon/icon.png') }}" type="image/png">
 
   {{-- Font --}}
-  <link href="https://fonts.googleapis.com" rel="preconnect">
-  <link href="https://fonts.gstatic.com" rel="preconnect" crossorigin>
-  <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+TC&display=swap" rel="stylesheet">
-  <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono&display=swap" rel="stylesheet">
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&family=Noto+Sans+TC:[email protected]&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
 
   @vite('resources/css/app.css')
 

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -29,12 +29,14 @@ export default {
             },
             fontFamily: {
                 sans: [
-                    "'Noto Sans TC', sans-serif",
+                    'Noto Sans TC',
+                    'Roboto',
                     ...defaultTheme.fontFamily.sans,
                 ],
                 'jetbrains-mono': [
-                    "'JetBrains Mono', monospace",
-                    "'Noto Sans TC', sans-serif",
+                    'JetBrains Mono',
+                    'Noto Sans TC',
+                    ...defaultTheme.fontFamily.sans,
                 ],
             },
             keyframes: {