Updated header links.

umami-software · Mar 27, 2021 · 86ed5d5 · 86ed5d5
1 parent b24b855
commit 86ed5d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/components/layout/Layout.js b/components/layout/Layout.js
@@ -1,21 +1,13 @@
 import React from 'react';
 import Head from 'next/head';
-import { useRouter } from 'next/router';
 import Header from 'components/layout/Header';
 import Footer from 'components/layout/Footer';
 
 export default function Layout({ title, children, header = true, footer = true }) {
-  const { basePath } = useRouter();
-
   return (
     <>
       <Head>
         <title>umami{title && ` - ${title}`}</title>
-        <link rel="icon" href={`${basePath}/favicon.ico`} />
-        <link
-          href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;600&display=swap"
-          rel="stylesheet"
-        />
       </Head>
       {header && <Header />}
       <main className="container">{children}</main>

diff --git a/pages/_app.js b/pages/_app.js
@@ -31,12 +31,17 @@ export default function App({ Component, pageProps }) {
   return (
     <Provider store={store}>
       <Head>
+        <link rel="icon" href={`${basePath}/favicon.ico`} />
         <link rel="apple-touch-icon" sizes="180x180" href={`${basePath}/apple-touch-icon.png`} />
         <link rel="icon" type="image/png" sizes="32x32" href={`${basePath}/favicon-32x32.png`} />
         <link rel="icon" type="image/png" sizes="16x16" href={`${basePath}/favicon-16x16.png`} />
         <link rel="manifest" href={`${basePath}/site.webmanifest`} />
         <link rel="mask-icon" href={`${basePath}/safari-pinned-tab.svg`} color="#5bbad5" />
         <link rel="preconnect" href="https://fonts.gstatic.com" />
+        <link
+          href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600&display=swap"
+          rel="stylesheet"
+        />
         <meta name="msapplication-TileColor" content="#da532c" />
         <meta name="theme-color" content="#ffffff" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />