Merge pull request #11308 from ethereum/staging

Deploy v7.22.1

Author: corwintines

.all-contributorsrc

@@ -10559,6 +10559,24 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "taminobaumann",
+      "name": "Tamino",
+      "avatar_url": "https://avatars.githubusercontent.com/u/48290617?v=4",
+      "profile": "http://taminobaumann.com",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "keccers",
+      "name": "Katherine Champagne",
+      "avatar_url": "https://avatars.githubusercontent.com/u/770277?v=4",
+      "profile": "https://github.com/keccers",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.storybook/preview.ts

@@ -3,6 +3,7 @@ import { action } from "@storybook/addon-actions"
 
 import i18n, { baseLocales } from "./i18next"
 import theme from "../src/@chakra-ui/gatsby-plugin/theme"
+import "../static/fonts/inter-font-face.css"
 
 const chakraBreakpointArray = Object.entries(theme.breakpoints)
 

README.md

@@ -175,7 +175,12 @@ Learn more about how we review pull requests [here](docs/review-process.md).
 
 - To help with verification we request GitHub contributors connect their GitHub account with their Discord account (Discord > Settings > Connections > GitHub). Crowdin contributors will be verified directly through Crowdin by our team.
 
-- If you haven't contributed yet and would like to earn a POAP to show your loyalty to the Ethereum space, head over to the [issues](https://github.com/ethereum/ethereum-org-website/issues/) tab to get started!
+### GitPOAP
+
+- If you've made at least one contribution and that gets merged into ethereum.org, GitPOAP will also auto recognize it and let you mint a unique contributor POAP.
+  [More on GitPOAP](https://www.gitpoap.io).
+
+If you haven't contributed yet and would like to earn a POAP to show your loyalty to the Ethereum space, head over to the [issues](https://github.com/ethereum/ethereum-org-website/issues/) tab to get started!
 
 <hr style="margin-top: 3em; margin-bottom: 3em;">
 
@@ -1649,6 +1654,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://ilanolkies.com"><img src="https://avatars.githubusercontent.com/u/36084092?v=4?s=100" width="100px;" alt="Ilan"/><br /><sub><b>Ilan</b></sub></a><br /><a href="#content-ilanolkies" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://mirror.xyz/umede.eth"><img src="https://avatars.githubusercontent.com/u/122288558?v=4?s=100" width="100px;" alt="umede"/><br /><sub><b>umede</b></sub></a><br /><a href="#content-umededoteth" title="Content">🖋</a></td>
+      <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>
     </tr>
   </tbody>
 </table>

docs/ds-implementation.md

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

package.json

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

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

@@ -12,18 +12,28 @@ const colors = {
     900: "#141414",
   },
   blue: {
-    100: "#dedeff",
-    300: "#8282ff",
-    500: "#1c1cff",
-    600: "#090990",
-    700: "#0b0b66",
+    50: "#F6F6FF",
+    100: "#EBEBFF",
+    200: "#D6D6FF",
+    300: "#9999FF",
+    400: "#5555FF",
+    500: "#1C1CFF",
+    600: "#0000E0",
+    700: "#0000A3",
+    800: "#000066",
+    900: "#000029",
   },
   orange: {
-    100: "#ffe3d3",
-    300: "#ffb991",
-    500: "#ff7324",
-    600: "#c95d20",
-    800: "#352313",
+    50: "#FFF3ED",
+    100: "#FFE5D6",
+    200: "#FFCBAD",
+    300: "#FFB185",
+    400: "#FF985C",
+    500: "#FF7324",
+    600: "#B84300",
+    700: "#7A2D00",
+    800: "#521E00",
+    900: "#2F1000",
   },
   red: {
     100: "#f7c8c8",

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

@@ -38,16 +38,16 @@ const semanticTokens = {
     // Main Set
     primary: {
       base: { _light: "blue.500", _dark: "orange.500" },
-      highContrast: { _light: "blue.700", _dark: "orange.100" },
-      lowContrast: { _light: "blue.100", _dark: "orange.800" },
-      hover: { _light: "blue.300", _dark: "orange.300" },
-      visited: { _light: "blue.600", _dark: "orange.600" },
+      highContrast: { _light: "blue.800", _dark: "orange.100" },
+      lowContrast: { _light: "blue.100", _dark: "orange.900" },
+      hover: { _light: "blue.400", _dark: "orange.400" },
+      visited: { _light: "blue.700", _dark: "orange.400" },
       // ! Deprecating primary.light
       light: { _light: "blue.100", _dark: "orange.100" },
       // ! Deprecating primary.dark
       dark: { _light: "blue.700", _dark: "orange.800" },
       // ! Deprecating primary.pressed
-      pressed: { _light: "blue.300", _dark: "orange.800" },
+      pressed: { _light: "blue.400", _dark: "orange.800" },
     },
     body: {
       base: { _light: "gray.700", _dark: "gray.100" },