Fix font loading

Yasamato · May 23, 2024 · ad7a1d2 · ad7a1d2
1 parent a38b0ab
commit ad7a1d2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/app/[lng]/layout.tsx b/app/[lng]/layout.tsx
@@ -15,10 +15,10 @@ export default async function RootLayout({
 }) {
   return (
     <html lang={lng}>
-      <body className="flex flex-col">
+      <body className="flex flex-col bg-white">
         <BVSRNavbar lng={lng} />
 
-        <main className="flex grow flex-col items-center gap-16 bg-[#eee]">
+        <main className="flex grow flex-col items-center gap-16">
           {children}
         </main>
 

diff --git a/app/global.css b/app/global.css
@@ -9,5 +9,5 @@ body {
 
 @font-face {
   font-family: "Maven Pro";
-  src: url("/MavenPro-VariableFont_wght.woff2") format("woff");
+  src: url("/assets/MavenPro-VariableFont_wght.woff2") format("woff");
 }
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -13,19 +13,19 @@ export default async function RootLayout({
         <link
           rel="apple-touch-icon"
           sizes="180x180"
-          href="/apple-touch-icon.png"
+          href="/assets/apple-touch-icon.png"
         />
         <link
           rel="icon"
           type="image/png"
           sizes="32x32"
-          href="/favicon-32x32.png"
+          href="/assets/favicon-32x32.png"
         />
         <link
           rel="icon"
           type="image/png"
           sizes="16x16"
-          href="/favicon-16x16.png"
+          href="/assets/favicon-16x16.png"
         />
         <link rel="manifest" href="/site.webmanifest" />
         <meta name="apple-mobile-web-app-title" content="BVSR" />
@@ -35,7 +35,7 @@ export default async function RootLayout({
 
         <link
           rel="preload"
-          href="/MavenPro-VariableFont_wght.woff2"
+          href="/assets/MavenPro-VariableFont_wght.woff2"
           as="font"
           type="font/woff2"
         />

diff --git a/components/layout/BVSRNavbar.tsx b/components/layout/BVSRNavbar.tsx
@@ -18,7 +18,7 @@ export default async function BVSRNavbar({ lng }: { lng: string }) {
 
   return (
     <Navbar fluid>
-      <div className="flex flex-col items-center gap-8 md:flex-row">
+      <div className="flex flex-col md:items-center md:gap-8 md:flex-row">
         <NavbarBrand href="https://bvsr.space">
           <Image
             src={bvsrLogo}
@@ -30,7 +30,7 @@ export default async function BVSRNavbar({ lng }: { lng: string }) {
           </span>
         </NavbarBrand>
         <NavbarCollapse>
-          <div className="relative flex flex-col items-center gap-4 md:flex-row">
+          <div className="relative flex flex-col md:items-center md:gap-4 md:flex-row">
             <Dropdown
               inline
               label={