Merge remote-tracking branch 'origin/dev' into refactor/ContentHero-content-adjustments

Author: TylerAPfledderer

.all-contributorsrc

@@ -11490,7 +11490,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/72754835?v=4",
       "profile": "https://github.com/0xemrekaya",
       "contributions": [
-        "tutorial"
+        "tutorial",
+        "doc"
       ]
     },
     {
@@ -11736,7 +11737,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/61613931?v=4",
       "profile": "https://dharmik79.github.io/portfolio.github.io/",
       "contributions": [
-        "bug"
+        "bug",
+        "code"
       ]
     },
     {
@@ -11829,7 +11831,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/8257719?v=4",
       "profile": "http://rashidma.com",
       "contributions": [
-        "bug"
+        "bug",
+        "doc"
       ]
     },
     {
@@ -11958,6 +11961,51 @@
       "contributions": [
         "maintenance"
       ]
+    },
+    {
+      "login": "liuye20240304",
+      "name": "liuye20240304",
+      "avatar_url": "https://avatars.githubusercontent.com/u/162123251?v=4",
+      "profile": "https://github.com/liuye20240304",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "zk-Lumi",
+      "name": "Daniel Lumi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/149794418?v=4",
+      "profile": "https://zksync.io",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "ZakGriffith",
+      "name": "Zak G",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12072395?v=4",
+      "profile": "https://github.com/ZakGriffith",
+      "contributions": [
+        "tutorial"
+      ]
+    },
+    {
+      "login": "barskhianfannie",
+      "name": "Fannie Barskhian",
+      "avatar_url": "https://avatars.githubusercontent.com/u/42990794?v=4",
+      "profile": "http://fanniebarskhian.com",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "ksdumont",
+      "name": "Keith Dumont",
+      "avatar_url": "https://avatars.githubusercontent.com/u/51958351?v=4",
+      "profile": "https://github.com/ksdumont",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/stale.yml

@@ -3,6 +3,7 @@ name: Close Stale Issues
 on:
   schedule:
     - cron: "0 8 * * *"
+  workflow_dispatch:
 
 jobs:
   stale:
@@ -13,6 +14,8 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-label: "Status: Stale"
-          stale-issue-message: "This issue is stale because it has been open 45 days with no activity."
-          days-before-stale: 45
+          stale-pr-label: "Status: Stale"
+          stale-issue-message: "This issue is stale because it has been open 30 days with no activity."
+          stale-pr-message: "This issue is stale because it has been open 30 days with no activity."
+          days-before-stale: 30
           days-before-close: -1

.storybook/preview.ts

@@ -9,7 +9,10 @@ import "../src/styles/global.css"
 
 const extendedTheme = extendBaseTheme(theme)
 
-const chakraBreakpointArray = Object.entries(extendedTheme.breakpoints)
+const chakraBreakpointArray = Object.entries(extendedTheme.breakpoints) as [
+  string,
+  string
+][]
 
 const preview: Preview = {
   globals: {
@@ -28,6 +31,11 @@ const preview: Preview = {
     backgrounds: {
       disable: true,
     },
+    options: {
+      storySort: {
+        order: ["Atoms", "Molecules", "Organisms", "Templates", "Pages"],
+      },
+    },
     chakra: {
       theme: extendedTheme,
     },
@@ -37,6 +45,9 @@ const preview: Preview = {
       viewports: chakraBreakpointArray.reduce((prevVal, currVal) => {
         const [token, key] = currVal
 
+        // `key` value is in em. Need to convert to px for Chromatic Story mode snapshots
+        const emToPx = (Number(key.replace("em", "")) * 16).toString() + "px"
+
         // Replace base value
         if (token === "base")
           return {
@@ -55,7 +66,7 @@ const preview: Preview = {
           [token]: {
             name: token,
             styles: {
-              width: key,
+              width: emToPx,
               height: "600px",
             },
           },

README.md

@@ -1765,7 +1765,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/niuhp"><img src="https://avatars.githubusercontent.com/u/7373524?v=4?s=100" width="100px;" alt="niuhp"/><br /><sub><b>niuhp</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aniuhp" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/xivanc"><img src="https://avatars.githubusercontent.com/u/91614446?v=4?s=100" width="100px;" alt="xivanc"/><br /><sub><b>xivanc</b></sub></a><br /><a href="#tool-xivanc" title="Tools">🔧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/zm-moon"><img src="https://avatars.githubusercontent.com/u/42063103?v=4?s=100" width="100px;" alt="patrick"/><br /><sub><b>patrick</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Azm-moon" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/0xemrekaya"><img src="https://avatars.githubusercontent.com/u/72754835?v=4?s=100" width="100px;" alt="Emre"/><br /><sub><b>Emre</b></sub></a><br /><a href="#tutorial-0xemrekaya" title="Tutorials">✅</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/0xemrekaya"><img src="https://avatars.githubusercontent.com/u/72754835?v=4?s=100" width="100px;" alt="Emre"/><br /><sub><b>Emre</b></sub></a><br /><a href="#tutorial-0xemrekaya" title="Tutorials">✅</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=0xemrekaya" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://ryokomy.com"><img src="https://avatars.githubusercontent.com/u/6007453?v=4?s=100" width="100px;" alt="Ryo Komiyama"/><br /><sub><b>Ryo Komiyama</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aryokomy" title="Bug reports">🐛</a></td>
     </tr>
     <tr>
@@ -1800,7 +1800,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Pedrojok01"><img src="https://avatars.githubusercontent.com/u/77141890?v=4?s=100" width="100px;" alt="Pedrojok01"/><br /><sub><b>Pedrojok01</b></sub></a><br /><a href="#maintenance-Pedrojok01" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Vid201"><img src="https://avatars.githubusercontent.com/u/38610409?v=4?s=100" width="100px;" alt="Vid Kersic"/><br /><sub><b>Vid Kersic</b></sub></a><br /><a href="#tool-Vid201" title="Tools">🔧</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AVid201" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.futantan.com"><img src="https://avatars.githubusercontent.com/u/6268441?v=4?s=100" width="100px;" alt="Tantan Fu"/><br /><sub><b>Tantan Fu</b></sub></a><br /><a href="#maintenance-futantan" title="Maintenance">🚧</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://dharmik79.github.io/portfolio.github.io/"><img src="https://avatars.githubusercontent.com/u/61613931?v=4?s=100" width="100px;" alt="Dharmik Dholariya"/><br /><sub><b>Dharmik Dholariya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ADharmik79" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://dharmik79.github.io/portfolio.github.io/"><img src="https://avatars.githubusercontent.com/u/61613931?v=4?s=100" width="100px;" alt="Dharmik Dholariya"/><br /><sub><b>Dharmik Dholariya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ADharmik79" title="Bug reports">🐛</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=Dharmik79" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://destiner.io"><img src="https://avatars.githubusercontent.com/u/4247901?v=4?s=100" width="100px;" alt="Timur Badretdinov"/><br /><sub><b>Timur Badretdinov</b></sub></a><br /><a href="#tool-Destiner" title="Tools">🔧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://blog.finxter.com/"><img src="https://avatars.githubusercontent.com/u/57671493?v=4?s=100" width="100px;" alt="Finxter"/><br /><sub><b>Finxter</b></sub></a><br /><a href="#ideas-finxter" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
@@ -1814,7 +1814,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/shravan-andoria/"><img src="https://avatars.githubusercontent.com/u/36509067?v=4?s=100" width="100px;" alt="shravanandoria"/><br /><sub><b>shravanandoria</b></sub></a><br /><a href="#maintenance-shravanandoria" title="Maintenance">🚧</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://rashidma.com"><img src="https://avatars.githubusercontent.com/u/8257719?v=4?s=100" width="100px;" alt="Rashid Ma"/><br /><sub><b>Rashid Ma</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amcmoodoo" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://rashidma.com"><img src="https://avatars.githubusercontent.com/u/8257719?v=4?s=100" width="100px;" alt="Rashid Ma"/><br /><sub><b>Rashid Ma</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amcmoodoo" title="Bug reports">🐛</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=mcmoodoo" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://prestwi.ch"><img src="https://avatars.githubusercontent.com/u/10149425?v=4?s=100" width="100px;" alt="James Prestwich"/><br /><sub><b>James Prestwich</b></sub></a><br /><a href="#content-prestwich" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/daiwt"><img src="https://avatars.githubusercontent.com/u/26290219?v=4?s=100" width="100px;" alt="Dai Wentao"/><br /><sub><b>Dai Wentao</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Adaiwt" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/beetrootkid"><img src="https://avatars.githubusercontent.com/u/34025634?v=4?s=100" width="100px;" alt="kuhant"/><br /><sub><b>kuhant</b></sub></a><br /><a href="#tool-beetrootkid" title="Tools">🔧</a></td>
@@ -1833,6 +1833,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://olorunsogo-portfolio-sand.vercel.app/"><img src="https://avatars.githubusercontent.com/u/99739569?v=4?s=100" width="100px;" alt="sogobanwo"/><br /><sub><b>sogobanwo</b></sub></a><br /><a href="#maintenance-sogobanwo" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/liuye20240304"><img src="https://avatars.githubusercontent.com/u/162123251?v=4?s=100" width="100px;" alt="liuye20240304"/><br /><sub><b>liuye20240304</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=liuye20240304" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://zksync.io"><img src="https://avatars.githubusercontent.com/u/149794418?v=4?s=100" width="100px;" alt="Daniel Lumi"/><br /><sub><b>Daniel Lumi</b></sub></a><br /><a href="#maintenance-zk-Lumi" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZakGriffith"><img src="https://avatars.githubusercontent.com/u/12072395?v=4?s=100" width="100px;" alt="Zak G"/><br /><sub><b>Zak G</b></sub></a><br /><a href="#tutorial-ZakGriffith" title="Tutorials">✅</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://fanniebarskhian.com"><img src="https://avatars.githubusercontent.com/u/42990794?v=4?s=100" width="100px;" alt="Fannie Barskhian"/><br /><sub><b>Fannie Barskhian</b></sub></a><br /><a href="#maintenance-barskhianfannie" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ksdumont"><img src="https://avatars.githubusercontent.com/u/51958351?v=4?s=100" width="100px;" alt="Keith Dumont"/><br /><sub><b>Keith Dumont</b></sub></a><br /><a href="#content-ksdumont" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>