Merge pull request #11626 from ethereum/dev

Release candidate v7.24.0

Author: corwintines

.all-contributorsrc

@@ -10713,6 +10713,60 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "tudorpintea999",
+      "name": "iwantanode",
+      "avatar_url": "https://avatars.githubusercontent.com/u/87604944?v=4",
+      "profile": "https://github.com/tudorpintea999",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "shak58",
+      "name": "shak58",
+      "avatar_url": "https://avatars.githubusercontent.com/u/150069539?v=4",
+      "profile": "https://github.com/shak58",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "Muhammad-Altabba",
+      "name": "Muhammad Altabba",
+      "avatar_url": "https://avatars.githubusercontent.com/u/24407834?v=4",
+      "profile": "https://linkedin.com/in/muhammadaltabba",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "darigovresearch",
+      "name": "Darigov Research",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30328618?v=4",
+      "profile": "https://www.darigovresearch.com/",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "shubhusion",
+      "name": "SHUBHAM SHARMA ",
+      "avatar_url": "https://avatars.githubusercontent.com/u/96301987?v=4",
+      "profile": "https://github.com/shubhusion",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "paulallensuxs",
+      "name": "paulallensuxs",
+      "avatar_url": "https://avatars.githubusercontent.com/u/114240091?v=4",
+      "profile": "https://github.com/paulallensuxs",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1675,6 +1675,14 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="http://p2p.org"><img src="https://avatars.githubusercontent.com/u/3310192?v=4?s=100" width="100px;" alt="Eugene"/><br /><sub><b>Eugene</b></sub></a><br /><a href="#content-rgb2hsl" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.danielgorbe.com"><img src="https://avatars.githubusercontent.com/u/36860942?v=4?s=100" width="100px;" alt="Dániel Görbe"/><br /><sub><b>Dániel Görbe</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=g0rbe" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://blog.insubli.me"><img src="https://avatars.githubusercontent.com/u/41712656?v=4?s=100" width="100px;" alt="s-crypt"/><br /><sub><b>s-crypt</b></sub></a><br /><a href="#content-s-crypt" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/tudorpintea999"><img src="https://avatars.githubusercontent.com/u/87604944?v=4?s=100" width="100px;" alt="iwantanode"/><br /><sub><b>iwantanode</b></sub></a><br /><a href="#content-tudorpintea999" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/shak58"><img src="https://avatars.githubusercontent.com/u/150069539?v=4?s=100" width="100px;" alt="shak58"/><br /><sub><b>shak58</b></sub></a><br /><a href="#content-shak58" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://linkedin.com/in/muhammadaltabba"><img src="https://avatars.githubusercontent.com/u/24407834?v=4?s=100" width="100px;" alt="Muhammad Altabba"/><br /><sub><b>Muhammad Altabba</b></sub></a><br /><a href="#content-Muhammad-Altabba" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.darigovresearch.com/"><img src="https://avatars.githubusercontent.com/u/30328618?v=4?s=100" width="100px;" alt="Darigov Research"/><br /><sub><b>Darigov Research</b></sub></a><br /><a href="#content-darigovresearch" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/shubhusion"><img src="https://avatars.githubusercontent.com/u/96301987?v=4?s=100" width="100px;" alt="SHUBHAM SHARMA "/><br /><sub><b>SHUBHAM SHARMA </b></sub></a><br /><a href="#ideas-shubhusion" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/paulallensuxs"><img src="https://avatars.githubusercontent.com/u/114240091?v=4?s=100" width="100px;" alt="paulallensuxs"/><br /><sub><b>paulallensuxs</b></sub></a><br /><a href="#content-paulallensuxs" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>

i18n/config.json

@@ -295,6 +295,14 @@
     "langDir": "ltr",
     "dateFormat": "MM/DD/YYYY"
   },
+  {
+    "code": "ne-np",
+    "crowdinCode": "ne-np",
+    "name": "Nepali",
+    "localName": "नेपाली",
+    "langDir": "ltr",
+    "dateFormat": "MM/DD/YYYY"
+  },
   {
     "code": "nl",
     "crowdinCode": "nl",

plugins/gatsby-remark-fix-static-urls/index.js

@@ -19,7 +19,7 @@ const isRelativeUrl = require("is-relative-url")
 module.exports = ({ markdownNode, markdownAST }) => {
   const fileAbsoluteDir = path.dirname(markdownNode.fileAbsolutePath)
   const sourceAbsoluteDir = fileAbsoluteDir.replace(
-    /translations\/\w{2}(-\w{2})?\//,
+    /translations\/\w{2,3}(-\w{2})?\//,
     ""
   )
   const relativePath = path.relative(fileAbsoluteDir, sourceAbsoluteDir)

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

@@ -14,15 +14,53 @@ const baseStyle = defineMergeStyles(defaultBaseStyle, {
   textTransform: "uppercase",
 })
 
-const variantSecondary = defineStyle({
-  borderColor: "primary100",
-  color: "text",
-})
+const COLOR_SCHEME_MAP = {
+  purple: {
+    color: "black300",
+    background: "primary100",
+    borderColor: "primary100",
+  },
+  orange: {
+    color: "text",
+    background: "orange.100",
+    borderColor: "orange.100",
+  },
+  green: {
+    color: "white",
+    background: "green.500",
+    borderColor: "green.500",
+  },
+  blue: {
+    color: "black",
+    background: "blue.300",
+    borderColor: "blue.300",
+  },
+  red: {
+    color: "white",
+    background: "red.500",
+    borderColor: "red.500",
+  },
+  pink: {
+    color: "black",
+    background: "red.100",
+    borderColor: "red.100",
+  },
+  gray: {
+    color: "black",
+    background: "gray.300",
+    borderColor: "gray.300",
+  },
+}
 
-const variantSolid = defineStyle({
-  color: "black300",
-  background: "primary100",
-})
+const variantSecondary = defineStyle(({ colorScheme: c = "orange" }) => ({
+  ...COLOR_SCHEME_MAP[c],
+  background: "transparent",
+}))
+
+const variantSolid = defineStyle(({ colorScheme: c = "purple" }) => ({
+  ...COLOR_SCHEME_MAP[c],
+  borderColor: "transparent",
+}))
 
 export const Badge = defineStyleConfig({
   baseStyle,

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

@@ -1,7 +1,5 @@
-import { mode } from "@chakra-ui/theme-tools"
-
 const styles = {
-  global: (props) => ({
+  global: {
     /**
      * THESE ARE OLD GLOBAL STYLES - carried over from old css files
      *
@@ -12,9 +10,7 @@ const styles = {
      * don't need the global styles anymore
      */
     body: {
-      // TODO: when we have Chakra v2, this should be done by overriding the
-      // native Chakra semantic tokens
-      bg: mode("white", "gray.800")(props),
+      bg: "background.base",
       lineHeight: "base",
       fontSize: "md",
     },
@@ -83,7 +79,7 @@ const styles = {
       lineHeight: "base",
       fontFamily: "monospace",
     },
-  }),
+  },
 }
 
 export default styles

src/assets/heroes/quizzes-hub-hero.png

@@ -0,0 +1,65 @@
+import React from "react"
+import { calc, Flex, FlexProps, HeadingProps } from "@chakra-ui/react"
+
+import ButtonDropdown, {
+  IProps as ButtonDropdownProps,
+  List as ButtonDropdownList,
+} from "../ButtonDropdown"
+import OldHeading from "../OldHeading"
+import Translation from "../Translation"
+import UpgradeTableOfContents from "../UpgradeTableOfContents"
+
+export const H2 = (props: HeadingProps) => (
+  <OldHeading
+    fontWeight={700}
+    lineHeight={1.4}
+    size="lg"
+    textAlign="left"
+    mt={0}
+    {...props}
+  />
+)
+
+export const StyledButtonDropdown = ({
+  list,
+  ...rest
+}: FlexProps & Pick<ButtonDropdownProps, "list">) => (
+  <Flex align="flex-end" justify="flex-end" mb={8} {...rest} pos="relative">
+    <ButtonDropdown list={list} w="full" minW="240px" />
+  </Flex>
+)
+
+interface IProps {
+  dropdownLinks?: ButtonDropdownList
+  maxDepth?: number
+  tocItems: any[]
+}
+
+const LeftNavBar: React.FC<IProps> = ({
+  dropdownLinks,
+  maxDepth = 1,
+  tocItems,
+}) => {
+  return (
+    <Flex
+      as="aside"
+      flexDirection="column"
+      flex="0 1 400px"
+      ml={8}
+      mr={16}
+      position="sticky"
+      top="6.25rem"
+      height={calc("100vh").subtract("80px").toString()}
+    >
+      {dropdownLinks && <StyledButtonDropdown list={dropdownLinks} />}
+      <H2>
+        <Translation id="on-this-page" />
+      </H2>
+      {tocItems && (
+        <UpgradeTableOfContents items={tocItems} maxDepth={maxDepth} />
+      )}
+    </Flex>
+  )
+}
+
+export default LeftNavBar

src/components/LeftNavBar/index.tsx

@@ -56,9 +56,15 @@ const TableOfContentsLink: React.FC<{ item: Item }> = (props) => {
       position="relative"
       display="inline-block"
       // `li :last-child` global selector wants to override this without `!important`
-      mb="0.5rem !important"
-      color="text300"
+      mb="1rem !important"
+      textDecoration="none"
+      color="body.medium"
       fontWeight="normal"
+      fontSize="xl"
+      _hover={{
+        color: "primary.hover",
+        textDecoration: "none",
+      }}
       _visited={{}}
     >
       {trimmedTitle(item.title)}
@@ -105,19 +111,10 @@ function UpgradeTableOfContents(props: {
       as="nav"
       p={0}
       mb={8}
-      textAlign="end"
       overflowY="auto"
       display={{ base: "none", l: "block" }}
     >
-      <List
-        m={0}
-        py={0}
-        ps={4}
-        pe={1}
-        fontSize="xl"
-        lineHeight="1.6"
-        styleType="none"
-      >
+      <List m={0} py={0} lineHeight="1.4">
         <ItemsList items={items} depth={0} maxDepth={maxDepth} />
       </List>
     </Box>

src/components/UpgradeTableOfContents.tsx

@@ -39,7 +39,7 @@ This Code of Conduct applies to all ethereum.org spaces (such as GitHub, Discord
 
 ### Our standards {#our-standards}
 
-Examples of behaviour that contributes to creating a positive environment include:
+Examples of behavior that contributes to creating a positive environment include:
 
 - Using welcoming and inclusive language
 - Being respectful of differing viewpoints and experiences