From 6d541c1f22fdd15ccfc03417306d1a2784b86cd8 Mon Sep 17 00:00:00 2001 From: dave | d1onys1us <13951458+d1onys1us@users.noreply.github.com> Date: Mon, 6 Feb 2023 16:54:45 -0500 Subject: [PATCH 01/12] fix(website): fix darkmode bug on docs website --- packages/website/components/ThemedImage.tsx | 1 + packages/website/pages/_app.tsx | 1 + packages/website/pages/_meta.json | 4 ++++ packages/website/theme.config.tsx | 2 +- pnpm-lock.yaml | 5 +---- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/website/components/ThemedImage.tsx b/packages/website/components/ThemedImage.tsx index 915ea19cd35..7e2dbb77dc6 100644 --- a/packages/website/components/ThemedImage.tsx +++ b/packages/website/components/ThemedImage.tsx @@ -12,6 +12,7 @@ function ThemedImage() { ? "/images/logotype-white.png" : "/images/logotype-black.png" ); + console.log(resolvedTheme); }, [resolvedTheme]); return src ? ( diff --git a/packages/website/pages/_app.tsx b/packages/website/pages/_app.tsx index 131a6be6e6b..47b8998fb3f 100644 --- a/packages/website/pages/_app.tsx +++ b/packages/website/pages/_app.tsx @@ -1,5 +1,6 @@ import "../styles.css"; import { Oxanium } from "@next/font/google"; +import { ThemeProvider } from "next-themes"; const oxanium = Oxanium({ subsets: ["latin"], diff --git a/packages/website/pages/_meta.json b/packages/website/pages/_meta.json index 8a27715e23e..3b3e3cf0464 100644 --- a/packages/website/pages/_meta.json +++ b/packages/website/pages/_meta.json @@ -18,7 +18,11 @@ "newWindow": true }, "testnet-links-dropdown": { +<<<<<<< HEAD "title": "Testnet Links", +======= + "title": "Snæfellsjökull Testnet", +>>>>>>> 494a6341 (fix(website): fix darkmode bug on docs website) "type": "menu", "items": { "status": { diff --git a/packages/website/theme.config.tsx b/packages/website/theme.config.tsx index c6f1d9cb5c6..926a280ee9c 100644 --- a/packages/website/theme.config.tsx +++ b/packages/website/theme.config.tsx @@ -19,6 +19,7 @@ export default { chat: { link: "https://discord.gg/taikoxyz", }, + darkMode: true, docsRepositoryBase: "https://github.com/taikoxyz/taiko-mono/blob/main/packages/website", editLink: { @@ -58,5 +59,4 @@ export default { titleTemplate: "%s – Taiko", }; }, - darkMode: true, }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 34fbfa74517..67825e04891 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5126,7 +5126,6 @@ packages: inherits: 2.0.4 minimalistic-assert: 1.0.1 safer-buffer: 2.1.2 - dev: true /asn1/0.2.6: resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==} @@ -5975,7 +5974,6 @@ packages: /bignumber.js/9.1.0: resolution: {integrity: sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==} - dev: true /binary-extensions/2.2.0: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} @@ -16702,7 +16700,6 @@ packages: /safer-buffer/2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - dev: true /sander/0.5.1: resolution: {integrity: sha512-3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA==} @@ -20283,4 +20280,4 @@ packages: version: 0.6.8 dependencies: bn.js: 4.12.0 - ethereumjs-util: 6.2.1 \ No newline at end of file + ethereumjs-util: 6.2.1 From 4645db5ed46fb0fa74321f6eec2c2f8be9f351c4 Mon Sep 17 00:00:00 2001 From: dave | d1onys1us <13951458+d1onys1us@users.noreply.github.com> Date: Mon, 6 Feb 2023 16:55:27 -0500 Subject: [PATCH 02/12] fix(website): fix darkmode bug on docs website --- packages/website/components/ThemedImage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/website/components/ThemedImage.tsx b/packages/website/components/ThemedImage.tsx index 7e2dbb77dc6..915ea19cd35 100644 --- a/packages/website/components/ThemedImage.tsx +++ b/packages/website/components/ThemedImage.tsx @@ -12,7 +12,6 @@ function ThemedImage() { ? "/images/logotype-white.png" : "/images/logotype-black.png" ); - console.log(resolvedTheme); }, [resolvedTheme]); return src ? ( From a40ae265f9f1933a6f43c3d881d8b0eb0119011f Mon Sep 17 00:00:00 2001 From: dave | d1onys1us <13951458+d1onys1us@users.noreply.github.com> Date: Mon, 6 Feb 2023 16:56:13 -0500 Subject: [PATCH 03/12] fix(website): fix darkmode bug on docs website --- packages/website/pages/_app.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/website/pages/_app.tsx b/packages/website/pages/_app.tsx index 47b8998fb3f..131a6be6e6b 100644 --- a/packages/website/pages/_app.tsx +++ b/packages/website/pages/_app.tsx @@ -1,6 +1,5 @@ import "../styles.css"; import { Oxanium } from "@next/font/google"; -import { ThemeProvider } from "next-themes"; const oxanium = Oxanium({ subsets: ["latin"], From 589b5c76216b6ee10036f68820ce8084aa8cfe61 Mon Sep 17 00:00:00 2001 From: dave | d1onys1us <13951458+d1onys1us@users.noreply.github.com> Date: Wed, 15 Feb 2023 09:58:11 -0500 Subject: [PATCH 04/12] update --- packages/website/pages/_meta.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/website/pages/_meta.json b/packages/website/pages/_meta.json index 3b3e3cf0464..8a27715e23e 100644 --- a/packages/website/pages/_meta.json +++ b/packages/website/pages/_meta.json @@ -18,11 +18,7 @@ "newWindow": true }, "testnet-links-dropdown": { -<<<<<<< HEAD "title": "Testnet Links", -======= - "title": "Snæfellsjökull Testnet", ->>>>>>> 494a6341 (fix(website): fix darkmode bug on docs website) "type": "menu", "items": { "status": { From a2e08c9f96c81a71bc035d06b4f7340c28dd2e49 Mon Sep 17 00:00:00 2001 From: dave | d1onys1us <13951458+d1onys1us@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:00:37 -0500 Subject: [PATCH 05/12] disable dark mode --- packages/website/theme.config.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/theme.config.tsx b/packages/website/theme.config.tsx index 926a280ee9c..f0d60a24d35 100644 --- a/packages/website/theme.config.tsx +++ b/packages/website/theme.config.tsx @@ -19,7 +19,7 @@ export default { chat: { link: "https://discord.gg/taikoxyz", }, - darkMode: true, + darkMode: false, docsRepositoryBase: "https://github.com/taikoxyz/taiko-mono/blob/main/packages/website", editLink: { From 7faa527f75180e94860de6e9f292ec45794bd4a9 Mon Sep 17 00:00:00 2001 From: dave | d1onys1us <13951458+d1onys1us@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:17:12 -0500 Subject: [PATCH 06/12] disable dark mode --- packages/website/theme.config.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/theme.config.tsx b/packages/website/theme.config.tsx index f0d60a24d35..926a280ee9c 100644 --- a/packages/website/theme.config.tsx +++ b/packages/website/theme.config.tsx @@ -19,7 +19,7 @@ export default { chat: { link: "https://discord.gg/taikoxyz", }, - darkMode: false, + darkMode: true, docsRepositoryBase: "https://github.com/taikoxyz/taiko-mono/blob/main/packages/website", editLink: { From 945db75c16f1e4bfa0b3a0b3605476deacd79d2a Mon Sep 17 00:00:00 2001 From: dave | d1onys1us <13951458+d1onys1us@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:30:08 -0500 Subject: [PATCH 07/12] disable dark mode --- packages/website/components/ThemedImage.tsx | 3 ++- packages/website/theme.config.tsx | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/website/components/ThemedImage.tsx b/packages/website/components/ThemedImage.tsx index 915ea19cd35..96eb0871fc9 100644 --- a/packages/website/components/ThemedImage.tsx +++ b/packages/website/components/ThemedImage.tsx @@ -12,7 +12,8 @@ function ThemedImage() { ? "/images/logotype-white.png" : "/images/logotype-black.png" ); - }, [resolvedTheme]); + console.log("resolved theme", resolvedTheme); + }, []); return src ? ( , + nextThemes: { + defaultTheme: "dark", + }, primaryHue: 315, project: { link: "https://github.com/taikoxyz", From a86d4226af124c8dfe98c74c88dc394cc14ce744 Mon Sep 17 00:00:00 2001 From: dave | d1onys1us <13951458+d1onys1us@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:30:56 -0500 Subject: [PATCH 08/12] disable dark mode --- packages/website/components/ThemedImage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/components/ThemedImage.tsx b/packages/website/components/ThemedImage.tsx index 96eb0871fc9..34cd2738026 100644 --- a/packages/website/components/ThemedImage.tsx +++ b/packages/website/components/ThemedImage.tsx @@ -13,7 +13,7 @@ function ThemedImage() { : "/images/logotype-black.png" ); console.log("resolved theme", resolvedTheme); - }, []); + }, [resolvedTheme]); return src ? ( Date: Wed, 15 Feb 2023 10:33:21 -0500 Subject: [PATCH 09/12] disable dark mode --- packages/website/theme.config.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/theme.config.tsx b/packages/website/theme.config.tsx index 1a4cad74613..efcd69aa550 100644 --- a/packages/website/theme.config.tsx +++ b/packages/website/theme.config.tsx @@ -51,7 +51,7 @@ export default { }, logo: , nextThemes: { - defaultTheme: "dark", + defaultTheme: "system", }, primaryHue: 315, project: { From c989f72b081ef6d4a0a60800c78379668cde544e Mon Sep 17 00:00:00 2001 From: dave | d1onys1us <13951458+d1onys1us@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:33:54 -0500 Subject: [PATCH 10/12] disable dark mode --- packages/website/components/ThemedImage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/website/components/ThemedImage.tsx b/packages/website/components/ThemedImage.tsx index 34cd2738026..915ea19cd35 100644 --- a/packages/website/components/ThemedImage.tsx +++ b/packages/website/components/ThemedImage.tsx @@ -12,7 +12,6 @@ function ThemedImage() { ? "/images/logotype-white.png" : "/images/logotype-black.png" ); - console.log("resolved theme", resolvedTheme); }, [resolvedTheme]); return src ? ( From 500c1da6df5d777aa555a03da623636a4121ac9e Mon Sep 17 00:00:00 2001 From: dave | d1onys1us <13951458+d1onys1us@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:38:38 -0500 Subject: [PATCH 11/12] disable dark mode --- packages/website/theme.config.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/theme.config.tsx b/packages/website/theme.config.tsx index efcd69aa550..287d7e29ac0 100644 --- a/packages/website/theme.config.tsx +++ b/packages/website/theme.config.tsx @@ -51,7 +51,7 @@ export default { }, logo: , nextThemes: { - defaultTheme: "system", + defaultTheme: "light", }, primaryHue: 315, project: { From e109cebda34aa3adaadcd8e46f00bb93df1d3479 Mon Sep 17 00:00:00 2001 From: dave | d1onys1us <13951458+d1onys1us@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:48:11 -0500 Subject: [PATCH 12/12] disable dark mode --- packages/website/components/Footer.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/website/components/Footer.tsx b/packages/website/components/Footer.tsx index 21b0716d0c2..96014d39577 100644 --- a/packages/website/components/Footer.tsx +++ b/packages/website/components/Footer.tsx @@ -2,9 +2,9 @@ export default function Footer() { return (