Merge pull request #10162 from ethereum/dev

Deploy v7.11.4

Author: nhsz

package.json

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

src/assets/roadmap/roadmap-future.png

@@ -8,16 +8,16 @@ export interface IProps extends ButtonProps {
 }
 
 const Button: React.FC<IProps> = ({ toId, children, ...props }) => {
-  const handleOnClick = () => {
-    if (!toId) {
-      return
+  const handleOnClick = (e: React.MouseEvent<HTMLButtonElement>) => {
+    if (toId) {
+      scrollIntoView(toId)
     }
 
-    scrollIntoView(toId)
+    props.onClick?.(e)
   }
 
   return (
-    <ChakraButton onClick={handleOnClick} {...props}>
+    <ChakraButton {...props} onClick={handleOnClick}>
       {children}
     </ChakraButton>
   )

src/assets/roadmap/roadmap-main.png

@@ -0,0 +1,12 @@
+import React from "react"
+import { FlexProps } from "@chakra-ui/react"
+import InfoBanner from "./InfoBanner"
+import Translation from "./Translation"
+
+const EnvWarningBanner: React.FC<FlexProps> = ({ ...flexProps }) => (
+  <InfoBanner isWarning {...flexProps}>
+    <Translation id="page-tutorials-env-banner" />
+  </InfoBanner>
+)
+
+export default EnvWarningBanner

src/assets/roadmap/roadmap-security.png

@@ -29,7 +29,7 @@ const InfoBanner: React.FC<IProps> = ({
       borderRadius={"sm"}
       maxW={shouldCenter ? "55rem" : "100%"}
       sx={{
-        "*": {
+        ":not(button)": {
           color: "black300 !important",
         },
       }}

src/assets/roadmap/roadmap-transactions.png

@@ -34,7 +34,7 @@ const RoadmapActionCard: React.FC<IProps> = ({
 }) => {
   const data = useStaticQuery(graphql`
     query RoadmapActionCard {
-      futureProofing: file(relativePath: { eq: "upgrades/core.png" }) {
+      futureProofing: file(relativePath: { eq: "roadmap/roadmap-future.png" }) {
         childImageSharp {
           gatsbyImageData(
             width: 400
@@ -45,7 +45,7 @@ const RoadmapActionCard: React.FC<IProps> = ({
           )
         }
       }
-      scaling: file(relativePath: { eq: "eth.png" }) {
+      scaling: file(relativePath: { eq: "roadmap/roadmap-transactions.png" }) {
         childImageSharp {
           gatsbyImageData(
             height: 260
@@ -55,7 +55,7 @@ const RoadmapActionCard: React.FC<IProps> = ({
           )
         }
       }
-      security: file(relativePath: { eq: "hackathon_transparent.png" }) {
+      security: file(relativePath: { eq: "roadmap/roadmap-security.png" }) {
         childImageSharp {
           gatsbyImageData(
             width: 380
@@ -66,7 +66,7 @@ const RoadmapActionCard: React.FC<IProps> = ({
           )
         }
       }
-      userExperience: file(relativePath: { eq: "enterprise-eth.png" }) {
+      userExperience: file(relativePath: { eq: "roadmap/roadmap-ux.png" }) {
         childImageSharp {
           gatsbyImageData(
             width: 380