Merge remote-tracking branch 'origin/dev' into feat/hero-new-ds

Author: TylerAPfledderer

.all-contributorsrc

@@ -10591,10 +10591,64 @@
       "login": "natpicone",
       "name": "Natalino Picone",
       "avatar_url": "https://avatars.githubusercontent.com/u/4753402?v=4",
-      "profile": "http://nozominetworks.com",
+      "profile": "https://chainlabo.com",
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "hammadsaedi",
+      "name": "Hammad Saaedi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/71373419?v=4",
+      "profile": "https://github.com/hammadsaedi",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "srn08",
+      "name": "Shaunak Nagrecha",
+      "avatar_url": "https://avatars.githubusercontent.com/u/105499798?v=4",
+      "profile": "https://github.com/srn08",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "schwindtkevin",
+      "name": "Kevin Schwindt",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1700789?v=4",
+      "profile": "https://github.com/schwindtkevin",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "robertkodra",
+      "name": "Robert",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36516516?v=4",
+      "profile": "https://github.com/robertkodra",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "0xObsidian",
+      "name": "obsidian",
+      "avatar_url": "https://avatars.githubusercontent.com/u/131651958?v=4",
+      "profile": "https://github.com/0xObsidian",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "MohamedFekryyy",
+      "name": "Fekry Aiad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36033065?v=4",
+      "profile": "http://www.scienft.com",
+      "contributions": [
+        "ideas"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1657,7 +1657,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="http://taminobaumann.com"><img src="https://avatars.githubusercontent.com/u/48290617?v=4?s=100" width="100px;" alt="Tamino"/><br /><sub><b>Tamino</b></sub></a><br /><a href="#content-taminobaumann" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/keccers"><img src="https://avatars.githubusercontent.com/u/770277?v=4?s=100" width="100px;" alt="Katherine Champagne"/><br /><sub><b>Katherine Champagne</b></sub></a><br /><a href="#content-keccers" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://coderoostr.com"><img src="https://avatars.githubusercontent.com/u/103231131?v=4?s=100" width="100px;" alt="Marcos González"/><br /><sub><b>Marcos González</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Coderoostr" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://nozominetworks.com"><img src="https://avatars.githubusercontent.com/u/4753402?v=4?s=100" width="100px;" alt="Natalino Picone"/><br /><sub><b>Natalino Picone</b></sub></a><br /><a href="#content-natpicone" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://chainlabo.com"><img src="https://avatars.githubusercontent.com/u/4753402?v=4?s=100" width="100px;" alt="Natalino Picone"/><br /><sub><b>Natalino Picone</b></sub></a><br /><a href="#content-natpicone" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hammadsaedi"><img src="https://avatars.githubusercontent.com/u/71373419?v=4?s=100" width="100px;" alt="Hammad Saaedi"/><br /><sub><b>Hammad Saaedi</b></sub></a><br /><a href="#content-hammadsaedi" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/srn08"><img src="https://avatars.githubusercontent.com/u/105499798?v=4?s=100" width="100px;" alt="Shaunak Nagrecha"/><br /><sub><b>Shaunak Nagrecha</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Asrn08" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/schwindtkevin"><img src="https://avatars.githubusercontent.com/u/1700789?v=4?s=100" width="100px;" alt="Kevin Schwindt"/><br /><sub><b>Kevin Schwindt</b></sub></a><br /><a href="#content-schwindtkevin" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/robertkodra"><img src="https://avatars.githubusercontent.com/u/36516516?v=4?s=100" width="100px;" alt="Robert"/><br /><sub><b>Robert</b></sub></a><br /><a href="#content-robertkodra" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/0xObsidian"><img src="https://avatars.githubusercontent.com/u/131651958?v=4?s=100" width="100px;" alt="obsidian"/><br /><sub><b>obsidian</b></sub></a><br /><a href="#content-0xObsidian" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.scienft.com"><img src="https://avatars.githubusercontent.com/u/36033065?v=4?s=100" width="100px;" alt="Fekry Aiad"/><br /><sub><b>Fekry Aiad</b></sub></a><br /><a href="#ideas-MohamedFekryyy" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
   </tbody>
 </table>

docs/ds-implementation.md

@@ -17,10 +17,10 @@ Follow the new component directory structure:
 ```markdown
 src/
 └── components/
-└── ComponentA/
-├── index.tsx
-├── ComponentA.stories.tsx
-└── // Any other files as applicable (utils, child components, useHook, etc.)
+····└── ComponentA/
+··········├── index.tsx
+··········├── ComponentA.stories.tsx
+··········└── // Any other files as applicable (utils, child components, useHook, etc.)
 ```
 
 ## Components creation/modification from the DS

docs/schema.md

@@ -1,12 +1,12 @@
 # Schema
 
-Our schema, used in the Gatsby GraphQL layer, is defined under the `src/schema` folder. These files are then grabbed by the createSchemaCustomization`Gatsby hook in`gatsby-node.ts`.
+Our schema, used in the Gatsby GraphQL layer, is defined under the `src/schema` folder. These files are then grabbed by the `createSchemaCustomization` Gatsby hook in `gatsby-node.ts`.
 There are two ways to define a schema in Gatsby:
 
 - GraphQL SDL, the traditional way using [template literals](https://graphql.org/learn/schema/)
 - And a more "programmatic" approach, which has more flexibility, [Gatsby Type Builders](https://www.gatsbyjs.com/docs/reference/graphql-data-layer/schema-customization/#gatsby-type-builders) with `schema.buildObjectType`
 
-That is why you see two folders in /schema
+That is why you see two folders in `/schema`
 
 - `src/schema/sdls` for GraphQL SDL
 - `src/schema/builders` for Gatsby Type Builders

package.json

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

redirects.json

@@ -335,6 +335,10 @@
     "fromPath": "/staking/withdraws",
     "toPath": "/en/staking/withdrawals/"
   },
+  {
+    "fromPath": "/*/writing-cohort",
+    "toPath": "https://ethereumwriterscohort.carrd.co/"
+  },
   {
     "fromPath": "/*/staking/withdraws",
     "toPath": "/:splat/staking/withdrawals/"

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

@@ -5,10 +5,10 @@ const { sizes: defaultSizes } = headingDefaultTheme
 
 const lineHeightScale = {
   "4xl": "6xs",
-  "3xl": ["5xs", null, "6xs"],
-  "2xl": ["5xs", null, "4xs"],
-  xl: ["3xs", null, "2xs"],
-  lg: ["3xs", null, "2xs"],
+  "3xl": ["6xs", null, "5xs"],
+  "2xl": ["4xs", null, "5xs"],
+  xl: ["2xs", null, "4xs"],
+  lg: ["2xs", null, "3xs"],
   md: "xs",
   sm: "base",
   xs: "base",

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

@@ -9,6 +9,7 @@ const colors = {
     500: "#646464",
     600: "#333333",
     700: "#222222",
+    800: "#1B1B1B",
     900: "#141414",
   },
   blue: {
@@ -30,6 +31,7 @@ const colors = {
     300: "#FFB185",
     400: "#FF985C",
     500: "#FF7324",
+    550: "#DF5A0E",
     600: "#B84300",
     700: "#7A2D00",
     800: "#521E00",

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

@@ -39,9 +39,9 @@ const semanticTokens = {
     primary: {
       base: { _light: "blue.500", _dark: "orange.500" },
       highContrast: { _light: "blue.800", _dark: "orange.100" },
-      lowContrast: { _light: "blue.100", _dark: "orange.900" },
+      lowContrast: { _light: "blue.100", _dark: "orange.800" },
       hover: { _light: "blue.400", _dark: "orange.400" },
-      visited: { _light: "blue.700", _dark: "orange.700" },
+      visited: { _light: "blue.700", _dark: "orange.550" },
       // ! Deprecating primary.light
       light: { _light: "blue.100", _dark: "orange.100" },
       // ! Deprecating primary.dark
@@ -50,14 +50,14 @@ const semanticTokens = {
       pressed: { _light: "blue.400", _dark: "orange.800" },
     },
     body: {
-      base: { _light: "gray.700", _dark: "gray.100" },
+      base: { _light: "gray.800", _dark: "gray.100" },
       medium: { _light: "gray.500", _dark: "gray.300" },
       light: { _light: "gray.200", _dark: "gray.600" },
       // ! Deprecating body.inverted
-      inverted: { _light: "gray.100", _dark: "gray.700" },
+      inverted: { _light: "gray.100", _dark: "gray.800" },
     },
     background: {
-      base: { _light: "white", _dark: "gray.700" },
+      base: { _light: "white", _dark: "gray.800" },
       highlight: { _light: "gray.100", _dark: "gray.900" },
     },
     disabled: { _light: "gray.400", _dark: "gray.500" },

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

@@ -14,9 +14,9 @@ const styles = {
     body: {
       // TODO: when we have Chakra v2, this should be done by overriding the
       // native Chakra semantic tokens
-      bg: mode("white", "gray.700")(props),
+      bg: mode("white", "gray.800")(props),
       lineHeight: "base",
-      fontSize: ["sm", null, "md"],
+      fontSize: "md",
     },
     a: {
       color: "primary.base",