Merge branch 'patch-fix-#8171' of https://github.com/ankitzm/ethereum-org-website into patch-fix-#8171

Author: ankitzm

.all-contributorsrc

@@ -9162,6 +9162,69 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "KurtMerbeth",
+      "name": "KurtMerbeth",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22886639?v=4",
+      "profile": "https://github.com/KurtMerbeth",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "EmperorRP",
+      "name": "Sai Leela Rahul Pujari",
+      "avatar_url": "https://avatars.githubusercontent.com/u/66853318?v=4",
+      "profile": "https://github.com/EmperorRP",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "SkyWarrior123",
+      "name": "SkyWarrior123",
+      "avatar_url": "https://avatars.githubusercontent.com/u/102062194?v=4",
+      "profile": "https://github.com/SkyWarrior123",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "yashovardhan",
+      "name": "Yashovardhan Agrawal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/21066442?v=4",
+      "profile": "http://yashovardhan.dev",
+      "contributions": [
+        "data"
+      ]
+    },
+    {
+      "login": "cheeky-gorilla",
+      "name": "cheeky-gorilla",
+      "avatar_url": "https://avatars.githubusercontent.com/u/76262359?v=4",
+      "profile": "https://github.com/cheeky-gorilla",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "ThreeMuskets12",
+      "name": "Noah Page",
+      "avatar_url": "https://avatars.githubusercontent.com/u/23061574?v=4",
+      "profile": "https://github.com/ThreeMuskets12",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "oceans404",
+      "name": "steph",
+      "avatar_url": "https://avatars.githubusercontent.com/u/91382964?v=4",
+      "profile": "https://github.com/oceans404",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1448,11 +1448,17 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="https://github.com/millecodex"><img src="https://avatars.githubusercontent.com/u/39792005?v=4?s=100" width="100px;" alt="Mille Codex"/><br /><sub><b>Mille Codex</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=millecodex" title="Documentation">📖</a></td>
       <td align="center"><a href="https://github.com/Gift-Stack"><img src="https://avatars.githubusercontent.com/u/72243506?v=4?s=100" width="100px;" alt="Gift Opia"/><br /><sub><b>Gift Opia</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Gift-Stack" title="Code">💻</a></td>
       <td align="center"><a href="https://dhirajgagrai.dev/"><img src="https://avatars.githubusercontent.com/u/22605432?v=4?s=100" width="100px;" alt="Dhiraj Gagrai"/><br /><sub><b>Dhiraj Gagrai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=dhirajgagrai" title="Code">💻</a></td>
+      <td align="center"><a href="https://github.com/KurtMerbeth"><img src="https://avatars.githubusercontent.com/u/22886639?v=4?s=100" width="100px;" alt="KurtMerbeth"/><br /><sub><b>KurtMerbeth</b></sub></a><br /><a href="#content-KurtMerbeth" title="Content">🖋</a></td>
+      <td align="center"><a href="https://github.com/EmperorRP"><img src="https://avatars.githubusercontent.com/u/66853318?v=4?s=100" width="100px;" alt="Sai Leela Rahul Pujari"/><br /><sub><b>Sai Leela Rahul Pujari</b></sub></a><br /><a href="#content-EmperorRP" title="Content">🖋</a></td>
+      <td align="center"><a href="https://github.com/SkyWarrior123"><img src="https://avatars.githubusercontent.com/u/102062194?v=4?s=100" width="100px;" alt="SkyWarrior123"/><br /><sub><b>SkyWarrior123</b></sub></a><br /><a href="#content-SkyWarrior123" title="Content">🖋</a></td>
+      <td align="center"><a href="http://yashovardhan.dev"><img src="https://avatars.githubusercontent.com/u/21066442?v=4?s=100" width="100px;" alt="Yashovardhan Agrawal"/><br /><sub><b>Yashovardhan Agrawal</b></sub></a><br /><a href="#data-yashovardhan" title="Data">🔣</a></td>
+    </tr>
+    <tr>
+      <td align="center"><a href="https://github.com/cheeky-gorilla"><img src="https://avatars.githubusercontent.com/u/76262359?v=4?s=100" width="100px;" alt="cheeky-gorilla"/><br /><sub><b>cheeky-gorilla</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Acheeky-gorilla" title="Bug reports">🐛</a></td>
+      <td align="center"><a href="https://github.com/ThreeMuskets12"><img src="https://avatars.githubusercontent.com/u/23061574?v=4?s=100" width="100px;" alt="Noah Page"/><br /><sub><b>Noah Page</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ThreeMuskets12" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/oceans404"><img src="https://avatars.githubusercontent.com/u/91382964?v=4?s=100" width="100px;" alt="steph"/><br /><sub><b>steph</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=oceans404" title="Code">💻</a></td>
     </tr>
   </tbody>
-  <tfoot>
-    
-  </tfoot>
 </table>
 
 <!-- markdownlint-restore -->

gatsby-browser.tsx

@@ -31,6 +31,7 @@ require("prismjs/components/prism-solidity")
 
 // Prevents <Layout/> from unmounting on page transitions
 // https://www.gatsbyjs.com/docs/layout-components/#how-to-prevent-layout-components-from-unmounting
+// @ts-ignore: returning `null` is not accepted by the `GatsbyBrowser` type def.
 export const wrapPageElement: GatsbyBrowser<
   any,
   Context
@@ -60,8 +61,7 @@ export const wrapPageElement: GatsbyBrowser<
     window.localStorage.setItem("eth-org-language", detected)
     window.location.replace(newUrl)
 
-    // can't return null here, must return an element
-    return <div />
+    return null
   }
 
   return <Layout {...props}>{element}</Layout>

gatsby-ssr.tsx

@@ -11,12 +11,26 @@ import type { GatsbySSR } from "gatsby"
 import Layout from "./src/components/Layout"
 
 import { Context } from "./src/types"
+import { IS_DEV } from "./src/utils/env"
+import { isLang } from "./src/utils/languages"
 
 // Prevents <Layout/> from unmounting on page transitions
 // https://www.gatsbyjs.com/docs/layout-components/#how-to-prevent-layout-components-from-unmounting
+// @ts-ignore: returning `null` is not accepted by the `GatsbySSR` type def.
 export const wrapPageElement: GatsbySSR<any, Context>["wrapPageElement"] = ({
   element,
   props,
 }) => {
+  const { location } = props
+  const { pathname } = location
+
+  const [, pathLocale] = pathname.split("/")
+
+  // this is to avoid having hydration issues on dev mode. Check the logic
+  // inside gatsby-browser.tsx
+  if (IS_DEV && !isLang(pathLocale)) {
+    return null
+  }
+
   return <Layout {...props}>{element}</Layout>
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "6.7.1",
+  "version": "6.7.4",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",

src/@chakra-ui/gatsby-plugin/foundations/shadows.ts

@@ -4,6 +4,15 @@ const shadows = {
   outline: "0 0 0 4px var(--eth-colors-primaryHover)",
   table:
     "0 14px 66px rgba(0,0,0,.07), 0 10px 17px rgba(0,0,0,.03), 0 4px 7px rgba(0,0,0,.05)",
+  tableBox: {
+    light:
+      "0 14px 66px rgba(0,0,0,.07), 0 10px 17px rgba(0,0,0,.03), 0 4px 7px rgba(0,0,0,.05)",
+    dark: "0 14px 66px hsla(0,0%,96.1%,.07), 0 10px 17px hsla(0,0%,96.1%,.03), 0 4px 7px hsla(0,0%,96.1%,.05)",
+  },
+  tableItemBox: {
+    light: "0 1px 1px rgba(0, 0, 0, 0.1)",
+    dark: "0 1px 1px hsla(0,0%,100%,.1)",
+  },
 }
 
 export default shadows