Skip to content

Commit 947d3a0

Browse files
authored
Merge pull request #972 from ffffffffspace/fix-favicons-basepath
fix layout `BASE_PATH` URLs
2 parents 0ec9066 + 110f24a commit 947d3a0

File tree

1 file changed

+26
-6
lines changed

1 file changed

+26
-6
lines changed

app/layout.tsx

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,41 @@ export const metadata: Metadata = {
5959
}
6060

6161
export default function RootLayout({ children }: { children: React.ReactNode }) {
62+
const basePath = process.env.BASE_PATH || ''
63+
6264
return (
6365
<html
6466
lang={siteMetadata.language}
6567
className={`${space_grotesk.variable} scroll-smooth`}
6668
suppressHydrationWarning
6769
>
68-
<link rel="apple-touch-icon" sizes="76x76" href="/static/favicons/apple-touch-icon.png" />
69-
<link rel="icon" type="image/png" sizes="32x32" href="/static/favicons/favicon-32x32.png" />
70-
<link rel="icon" type="image/png" sizes="16x16" href="/static/favicons/favicon-16x16.png" />
71-
<link rel="manifest" href="/static/favicons/site.webmanifest" />
72-
<link rel="mask-icon" href="/static/favicons/safari-pinned-tab.svg" color="#5bbad5" />
70+
<link
71+
rel="apple-touch-icon"
72+
sizes="76x76"
73+
href={`${basePath}/static/favicons/apple-touch-icon.png`}
74+
/>
75+
<link
76+
rel="icon"
77+
type="image/png"
78+
sizes="32x32"
79+
href={`${basePath}/static/favicons/favicon-32x32.png`}
80+
/>
81+
<link
82+
rel="icon"
83+
type="image/png"
84+
sizes="16x16"
85+
href={`${basePath}/static/favicons/favicon-16x16.png`}
86+
/>
87+
<link rel="manifest" href={`${basePath}/static/favicons/site.webmanifest`} />
88+
<link
89+
rel="mask-icon"
90+
href={`${basePath}/static/favicons/safari-pinned-tab.svg`}
91+
color="#5bbad5"
92+
/>
7393
<meta name="msapplication-TileColor" content="#000000" />
7494
<meta name="theme-color" media="(prefers-color-scheme: light)" content="#fff" />
7595
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="#000" />
76-
<link rel="alternate" type="application/rss+xml" href="/feed.xml" />
96+
<link rel="alternate" type="application/rss+xml" href={`${basePath}/feed.xml`} />
7797
<body className="bg-white pl-[calc(100vw-100%)] text-black antialiased dark:bg-gray-950 dark:text-white">
7898
<ThemeProviders>
7999
<Analytics analyticsConfig={siteMetadata.analytics as AnalyticsConfig} />

0 commit comments

Comments
 (0)