Merge remote-tracking branch 'origin/dev' into refactor/trilemma-chakra-updates

Author: TylerAPfledderer

.all-contributorsrc

@@ -7762,7 +7762,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/9850322?v=4",
       "profile": "http://setharielgreen.com",
       "contributions": [
-        "doc"
+        "doc",
+        "content"
       ]
     },
     {
@@ -10384,6 +10385,43 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "perriefidelis",
+      "name": "Peace Ojemeh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30669761?v=4",
+      "profile": "https://github.com/perriefidelis",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "woseK",
+      "name": "woseK",
+      "avatar_url": "https://avatars.githubusercontent.com/u/110729731?v=4",
+      "profile": "https://github.com/woseK",
+      "contributions": [
+        "content",
+        "bug"
+      ]
+    },
+    {
+      "login": "gunal-123",
+      "name": "Gunal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/103403219?v=4",
+      "profile": "https://github.com/gunal-123",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "LadyDhaga",
+      "name": "chinaman123",
+      "avatar_url": "https://avatars.githubusercontent.com/u/106376368?v=4",
+      "profile": "https://github.com/LadyDhaga",
+      "contributions": [
+        "ideas"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1256,7 +1256,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="http://graz.network"><img src="https://avatars.githubusercontent.com/u/102697012?v=4?s=100" width="100px;" alt="Graz Network"/><br /><sub><b>Graz Network</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=graz-network" title="Documentation">📖</a> <a href="#translation-graz-network" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.youtube.com/c/Cryptoversidad"><img src="https://avatars.githubusercontent.com/u/107050863?v=4?s=100" width="100px;" alt="Cryptoversidad"/><br /><sub><b>Cryptoversidad</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=cryptoversidad" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://disconnect3d.pl/"><img src="https://avatars.githubusercontent.com/u/10009354?v=4?s=100" width="100px;" alt="Disconnect3d"/><br /><sub><b>Disconnect3d</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=disconnect3d" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Adisconnect3d" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://setharielgreen.com"><img src="https://avatars.githubusercontent.com/u/9850322?v=4?s=100" width="100px;" alt="Seth Ariel Green"/><br /><sub><b>Seth Ariel Green</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=setgree" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://setharielgreen.com"><img src="https://avatars.githubusercontent.com/u/9850322?v=4?s=100" width="100px;" alt="Seth Ariel Green"/><br /><sub><b>Seth Ariel Green</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=setgree" title="Documentation">📖</a> <a href="#content-setgree" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/lcalixxto/"><img src="https://avatars.githubusercontent.com/u/98348072?v=4?s=100" width="100px;" alt="Luisa Calixto"/><br /><sub><b>Luisa Calixto</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=lcalixxto" title="Documentation">📖</a> <a href="#content-lcalixxto" title="Content">🖋</a></td>
     </tr>
     <tr>
@@ -1624,6 +1624,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/MwitahJob"><img src="https://avatars.githubusercontent.com/u/136892656?v=4?s=100" width="100px;" alt="Mwitah "/><br /><sub><b>Mwitah </b></sub></a><br /><a href="#content-MwitahJob" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/TucksonDev"><img src="https://avatars.githubusercontent.com/u/105675159?v=4?s=100" width="100px;" alt="Tuckson"/><br /><sub><b>Tuckson</b></sub></a><br /><a href="#content-TucksonDev" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://twitter.com/_Akamig"><img src="https://avatars.githubusercontent.com/u/6278999?v=4?s=100" width="100px;" alt="Akamig"/><br /><sub><b>Akamig</b></sub></a><br /><a href="#content-Akamig" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/perriefidelis"><img src="https://avatars.githubusercontent.com/u/30669761?v=4?s=100" width="100px;" alt="Peace Ojemeh"/><br /><sub><b>Peace Ojemeh</b></sub></a><br /><a href="#content-perriefidelis" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/woseK"><img src="https://avatars.githubusercontent.com/u/110729731?v=4?s=100" width="100px;" alt="woseK"/><br /><sub><b>woseK</b></sub></a><br /><a href="#content-woseK" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AwoseK" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gunal-123"><img src="https://avatars.githubusercontent.com/u/103403219?v=4?s=100" width="100px;" alt="Gunal"/><br /><sub><b>Gunal</b></sub></a><br /><a href="#content-gunal-123" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/LadyDhaga"><img src="https://avatars.githubusercontent.com/u/106376368?v=4?s=100" width="100px;" alt="chinaman123"/><br /><sub><b>chinaman123</b></sub></a><br /><a href="#ideas-LadyDhaga" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
   </tbody>
 </table>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "7.17.2",
+  "version": "7.19.1",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "[email protected]:ethereum/ethereum-org-website.git",

redirects.json

@@ -338,5 +338,9 @@
   {
     "fromPath": "/*/staking/withdraws",
     "toPath": "/:splat/staking/withdrawals/"
+  },
+  {
+    "fromPath": "/*/guides/how-to-register-an-ethereum-account",
+    "toPath": "/:splat/guides/how-to-create-an-ethereum-account/"
   }
 ]

src/@chakra-ui/gatsby-plugin/components/Button.ts

@@ -39,6 +39,10 @@ const variantSolid = defineStyle({
   color: "background.base",
   bg: "primary.base",
   borderColor: "transparent",
+  _disabled: {
+    bg: "disabled",
+    color: "background.base",
+  },
   _hover: {
     color: "background.base",
     bg: "primary.hover",

src/@chakra-ui/gatsby-plugin/components/Link.ts

@@ -4,13 +4,22 @@ import { defineMergeStyles, linkDefaultTheme } from "./components.utils"
 export const Link = defineStyleConfig({
   baseStyle: defineMergeStyles(linkDefaultTheme.baseStyle, {
     color: "primary.base",
-    textDecoration: "underline",
-    _focus: {
-      boxShadow: "none",
-    },
+    textDecor: "underline",
+    textUnderlineOffset: "3px",
     _focusVisible: {
       boxShadow: "none",
-      outline: "auto",
+      outline: "2px solid",
+      outlineColor: "primary.hover",
+      outlineOffset: "2px",
+      borderRadius: "sm",
+    },
+    _hover: {
+      color: "primary.hover",
+    },
+    "&[data-inline-link]": {
+      _visited: {
+        color: "primary.visited",
+      },
     },
   }),
 })

src/@chakra-ui/gatsby-plugin/components/Table.ts

@@ -0,0 +1,93 @@
+import { tableAnatomy } from "@chakra-ui/anatomy"
+import {
+  createMultiStyleConfigHelpers,
+  cssVar,
+  defineStyle,
+} from "@chakra-ui/react"
+import { defineMergeStyles, tableDefaultTheme } from "./components.utils"
+
+const { defineMultiStyleConfig, definePartsStyle } =
+  createMultiStyleConfigHelpers(tableAnatomy.keys)
+
+const $bgColor = cssVar("bg-color")
+
+const cellPadding = defineStyle({
+  p: 4,
+})
+
+const baseStyle = defineMergeStyles(
+  tableDefaultTheme.baseStyle,
+  definePartsStyle({
+    table: {
+      [$bgColor.variable]: "colors.background.highlight",
+      minW: "556px",
+    },
+    th: {
+      borderBottom: "1px",
+      borderColor: "body.base",
+      color: "body.base",
+      textTransform: "capitalize",
+      verticalAlign: "bottom",
+      ...cellPadding,
+    },
+    tr: {
+      "th, td": {
+        _notLast: {
+          borderRight: "2px",
+          borderRightColor: "background.base",
+        },
+      },
+    },
+    td: {
+      ...cellPadding,
+    },
+    tbody: {
+      tr: {
+        verticalAlign: "top",
+        _hover: {
+          /**
+           * Override specificity when hovering
+           * over even rows in 'striped' variant.
+           */
+          bg: $bgColor.reference,
+        },
+      },
+    },
+  })
+)
+
+const variantMinimalStriped = definePartsStyle({
+  tbody: {
+    tr: {
+      _even: {
+        bg: $bgColor.reference,
+      },
+    },
+  },
+})
+
+const variantSimpleStriped = definePartsStyle({
+  ...variantMinimalStriped,
+  thead: {
+    bg: $bgColor.reference,
+  },
+})
+
+const variantSimple = definePartsStyle({
+  thead: {
+    bg: $bgColor.reference,
+  },
+})
+
+export const Table = defineMultiStyleConfig({
+  baseStyle,
+  variants: {
+    minimal: {},
+    "minimal-striped": variantMinimalStriped,
+    simple: variantSimple,
+    "simple-striped": variantSimpleStriped,
+  },
+  defaultProps: {
+    variant: "simple",
+  },
+})

src/@chakra-ui/gatsby-plugin/components/index.ts

@@ -8,6 +8,7 @@ import { Modal } from "./Modal"
 import { Checkbox } from "./Checkbox"
 import { Progress } from "./Progress"
 import { Tabs } from "./Tabs"
+import { Table } from "./Table"
 import { Radio } from "./Radio"
 import { Select } from "./Select"
 import { Switch } from "./Switch"
@@ -24,7 +25,6 @@ import {
   headingDefaultTheme,
   menuDefaultTheme,
   spinnerDefaultTheme,
-  tableDefaultTheme,
 } from "./components.utils"
 
 export default {
@@ -51,7 +51,7 @@ export default {
   Select,
   Spinner: spinnerDefaultTheme,
   Switch,
-  Table: tableDefaultTheme,
+  Table,
   Tabs,
   Tag,
 }

src/@chakra-ui/gatsby-plugin/semanticTokens.ts

@@ -60,7 +60,7 @@ const semanticTokens = {
       base: { _light: "white", _dark: "gray.700" },
       highlight: { _light: "gray.100", _dark: "gray.900" },
     },
-    disabled: { _light: "gray.300", _dark: "gray.500" },
+    disabled: { _light: "gray.400", _dark: "gray.500" },
     // ! Deprecating neutral
     neutral: { _light: "white", _dark: "gray.900" },