Merge branch 'dev' into fix-layer2-toid-scroll

Author: nhsz

.storybook/manager.js

@@ -1,6 +1,12 @@
 import { addons } from "@storybook/addons"
 import theme from "./theme"
+import favicon from "../src/assets/favicon.png"
 
 addons.setConfig({
   theme,
 })
+
+const link = document.createElement("link")
+link.setAttribute("rel", "shortcut icon")
+link.setAttribute("href", favicon)
+document.head.appendChild(link)

docs/deploy-and-review-process.md

@@ -4,7 +4,7 @@ This documentation outlines our current processes for how we deploy the latest c
 
 ## Deploy process
 
-Anything merged into the `dev` branch of [ethereum.org](http://ethereum.org) will go live on ethereum.org at the next release. Currently, we deploy the latest changes to [ethereum.org](http://ethereum.org) twice per week (Monday and Thursday). When deploying, we merge the `dev` branch into the `master` branch. The `master` branch is the latest live version of [ethereum.org](https://ethereum.org).
+Anything merged into the `dev` branch of [ethereum.org](http://ethereum.org) will go live on ethereum.org at the next release. Currently, we deploy the latest changes to [ethereum.org](http://ethereum.org) twice per week (Tuesday and Thursday). When deploying, we merge the `dev` branch into the `master` branch. The `master` branch is the latest live version of [ethereum.org](https://ethereum.org).
 
 Occasionally, we’ll also do a patch deploy to fix an urgent or widespread issue.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "7.10.0",
+  "version": "7.11.2",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",
@@ -43,7 +43,7 @@
     "gatsby-plugin-react-i18next": "^3.0.1",
     "gatsby-plugin-react-svg": "^3.3.0",
     "gatsby-plugin-robots-txt": "^1.8.0",
-    "gatsby-plugin-sharp": "^5.4.0",
+    "gatsby-plugin-sharp": "^5.8.1",
     "gatsby-plugin-sitemap": "^6.4.0",
     "gatsby-remark-autolink-headers": "^5.21.0",
     "gatsby-remark-copy-linked-files": "^5.21.0",
@@ -85,14 +85,14 @@
     "@chakra-ui/cli": "^2.3.0",
     "@chakra-ui/storybook-addon": "^4.0.12",
     "@netlify/functions": "^1.2.0",
-    "@storybook/addon-a11y": "^7.0.0-beta.51",
-    "@storybook/addon-actions": "^7.0.0-beta.51",
-    "@storybook/addon-essentials": "^7.0.0-beta.51",
-    "@storybook/addon-interactions": "^7.0.0-beta.51",
-    "@storybook/addon-links": "^7.0.0-beta.51",
-    "@storybook/react": "^7.0.0-beta.51",
-    "@storybook/react-webpack5": "^7.0.0-beta.51",
-    "@storybook/testing-library": "^0.0.14-next.1",
+    "@storybook/addon-a11y": "^7.0.6",
+    "@storybook/addon-actions": "^7.0.6",
+    "@storybook/addon-essentials": "^7.0.6",
+    "@storybook/addon-interactions": "^7.0.6",
+    "@storybook/addon-links": "^7.0.6",
+    "@storybook/react": "^7.0.6",
+    "@storybook/react-webpack5": "^7.0.6",
+    "@storybook/testing-library": "^0.1.0",
     "@types/browser-lang": "^0.1.0",
     "@types/github-slugger": "^1.3.0",
     "@types/luxon": "^2.3.2",
@@ -112,7 +112,7 @@
     "prettier": "^2.2.1",
     "pretty-quick": "^3.1.0",
     "rimraf": "^4.1.1",
-    "storybook": "^7.0.0-beta.51",
+    "storybook": "^7.0.6",
     "ts-node": "^10.9.1",
     "typescript": "^4.6.3",
     "walkdir": "^0.4.1"

redirects.json

@@ -287,14 +287,6 @@
     "fromPath": "/*/eth2/deposit-contract/",
     "toPath": "/:splat/staking/deposit-contract/"
   },
-  {
-    "fromPath": "/*/eth2/get-involved/medalla-data-challenge",
-    "toPath": "/:splat/community/grants/medalla-data-challenge/"
-  },
-  {
-    "fromPath": "/*/eth2/get-involved/staking-community-grants",
-    "toPath": "/:splat/community/grants/staking-community-grants/"
-  },
   {
     "fromPath": "/*/eth2",
     "toPath": "/:splat/upgrades/"
@@ -342,5 +334,9 @@
   {
     "fromPath": "/*/staking/withdraws",
     "toPath": "/:splat/staking/withdrawals/"
+  },
+  {
+    "fromPath": "/*/writing-cohort",
+    "toPath": "https://ethereumwriterscohort.carrd.co/"
   }
 ]

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

@@ -1,13 +1,15 @@
 import colors from "./colors"
 import shadows from "./shadows"
 import typography from "./typography"
+import sizes from "./sizes"
 
 // Check the following link to see all the possible options:
 // https://github.com/chakra-ui/chakra-ui/blob/main/packages/theme/src/foundations/index.ts
 const foundations = {
   colors,
   shadows,
   ...typography,
+  sizes,
 }
 
 export default foundations

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

@@ -16,6 +16,8 @@ const shadows = {
     dark: "0 1px 1px hsla(0,0%,100%,.1)",
   },
   tableItemBoxHover: "0 0 1px var(--eth-colors-primary)",
+  gridYellowBoxShadow: "8px 8px 0px 0px var(--eth-colors-gridYellow)",
+  gridBlueBowShadow: "8px 8px 0px 0px var(--eth-colors-gridBlue)",
 
   // * Part of new DS
   // TODO: From current theme. Rename to 'buttonHover'

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

@@ -0,0 +1,9 @@
+const container = {
+  "2xl": "1440px",
+}
+
+const sizes = {
+  container,
+}
+
+export default sizes