Home Explore Help
Sign In
tuonq
/
ChatAI
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge pull request #1450 from yorunning/fix-1

fix: the theme-color selector
Yifei Zhang 1 year ago
parent
330504b91e dd5604f5d9
commit
1a626a68f0
2 changed files with 13 additions and 15 deletions
Split View Show Diff Stats
  1. 3 3
      app/components/home.tsx
  2. 10 12
      app/layout.tsx

+ 3 - 3
app/components/home.tsx
View File 

@@ -64,17 +64,17 @@ export function useSwitchTheme() {
 
     }
 
 
     const metaDescriptionDark = document.querySelector(
 
-      'meta[name="theme-color"][media]',
 
+      'meta[name="theme-color"][media*="dark"]',
 
     );
 
     const metaDescriptionLight = document.querySelector(
 
-      'meta[name="theme-color"]:not([media])',
 
+      'meta[name="theme-color"][media*="light"]',
 
     );
 
 
     if (config.theme === "auto") {
 
       metaDescriptionDark?.setAttribute("content", "#151515");
 
       metaDescriptionLight?.setAttribute("content", "#fafafa");
 
     } else {
 
-      const themeColor = getCSSVar("--themeColor");
 
+      const themeColor = getCSSVar("--theme-color");
 
       metaDescriptionDark?.setAttribute("content", themeColor);
 
       metaDescriptionLight?.setAttribute("content", themeColor);
 
     }

+ 10 - 12
app/layout.tsx
View File 

@@ -9,11 +9,19 @@ const buildConfig = getBuildConfig();
 
 export const metadata = {
 
   title: "ChatGPT Next Web",
 
   description: "Your personal ChatGPT Chat Bot.",
 
+  viewport: {
 
+    width: "device-width",
 
+    initialScale: 1,
 
+    maximumScale: 1,
 
+  },
 
+  themeColor: [
 
+    { media: "(prefers-color-scheme: light)", color: "#fafafa" },
 
+    { media: "(prefers-color-scheme: dark)", color: "#151515" },
 
+  ],
 
   appleWebApp: {
 
     title: "ChatGPT Next Web",
 
     statusBarStyle: "default",
 
   },
 
-  viewport: "width=device-width, initial-scale=1, maximum-scale=1",
 
 };
 
 
 export default function RootLayout({
 
@@ -24,22 +32,12 @@ export default function RootLayout({
 
   return (
 
     <html lang="en">
 
       <head>
 
-        <meta
 
-          name="theme-color"
 
-          content="#fafafa"
 
-          media="(prefers-color-scheme: light)"
 
-        />
 
-        <meta
 
-          name="theme-color"
 
-          content="#151515"
 
-          media="(prefers-color-scheme: dark)"
 
-        />
 
         <meta name="version" content={buildConfig.commitId} />
 
         <link rel="manifest" href="/site.webmanifest"></link>
 
         <link rel="preconnect" href="https://fonts.proxy.ustclug.org"></link>
 
         <link
 
-          href="https://fonts.proxy.ustclug.org/css2?family=Noto+Sans+SC:wght@300;400;700;900&display=swap"
 
           rel="stylesheet"
 
+          href="https://fonts.proxy.ustclug.org/css2?family=Noto+Sans+SC:wght@300;400;700;900&display=swap"
 
         ></link>
 
         <script src="/serviceWorkerRegister.js" defer></script>
 
       </head>