Skip to content

Commit

Permalink
Merge pull request #8390 from ethereum/dev
Browse files Browse the repository at this point in the history
Deploy v6.8.0
  • Loading branch information
wackerow authored Oct 28, 2022
2 parents e4f5526 + 3a79905 commit 0e740f8
Show file tree
Hide file tree
Showing 190 changed files with 9,685 additions and 2,496 deletions.
69 changes: 67 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -9016,7 +9016,8 @@
"avatar_url": "https://avatars.githubusercontent.com/u/52166437?v=4",
"profile": "https://lawlesx.vercel.app/",
"contributions": [
"doc"
"doc",
"code"
]
},
{
Expand Down Expand Up @@ -9323,7 +9324,8 @@
"avatar_url": "https://avatars.githubusercontent.com/u/106926150?v=4",
"profile": "https://sebastiansupreme.eth.link",
"contributions": [
"ideas"
"ideas",
"translation"
]
},
{
Expand All @@ -9334,6 +9336,69 @@
"contributions": [
"doc"
]
},
{
"login": "Mahmadabid",
"name": "Muhammad Ahmad",
"avatar_url": "https://avatars.githubusercontent.com/u/75790323?v=4",
"profile": "https://mahmad.netlify.app/",
"contributions": [
"code"
]
},
{
"login": "this-oliver",
"name": "Oliver",
"avatar_url": "https://avatars.githubusercontent.com/u/32515201?v=4",
"profile": "http://oliverrr.net",
"contributions": [
"doc"
]
},
{
"login": "jiOnederfull",
"name": "Jiwon Park",
"avatar_url": "https://avatars.githubusercontent.com/u/48719289?v=4",
"profile": "https://github.com/jiOnederfull",
"contributions": [
"doc"
]
},
{
"login": "ZandtLavish",
"name": "Zandt Lavish",
"avatar_url": "https://avatars.githubusercontent.com/u/99204971?v=4",
"profile": "https://github.com/ZandtLavish",
"contributions": [
"doc"
]
},
{
"login": "issa-me-sush",
"name": "sushthecoda",
"avatar_url": "https://avatars.githubusercontent.com/u/29679285?v=4",
"profile": "https://github.com/issa-me-sush",
"contributions": [
"doc"
]
},
{
"login": "LucasMartinCalderon",
"name": "Lucas Martin Calderon",
"avatar_url": "https://avatars.githubusercontent.com/u/25382998?v=4",
"profile": "http://pentestify.io",
"contributions": [
"doc"
]
},
{
"login": "crypto8893",
"name": "crypto8893",
"avatar_url": "https://avatars.githubusercontent.com/u/115051650?v=4",
"profile": "https://github.com/crypto8893",
"contributions": [
"content"
]
}
],
"contributorsPerLine": 7,
Expand Down
13 changes: 11 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1427,7 +1427,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="https://github.com/Aksa12"><img src="https://avatars.githubusercontent.com/u/41188167?v=4?s=100" width="100px;" alt="Aksa12"/><br /><sub><b>Aksa12</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Aksa12" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://lawlesx.vercel.app/"><img src="https://avatars.githubusercontent.com/u/52166437?v=4?s=100" width="100px;" alt="Aniruddha Sil"/><br /><sub><b>Aniruddha Sil</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=lawlesx" title="Documentation">📖</a></td>
<td align="center"><a href="https://lawlesx.vercel.app/"><img src="https://avatars.githubusercontent.com/u/52166437?v=4?s=100" width="100px;" alt="Aniruddha Sil"/><br /><sub><b>Aniruddha Sil</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=lawlesx" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=lawlesx" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/bt3gl"><img src="https://avatars.githubusercontent.com/u/1130416?v=4?s=100" width="100px;" alt="♡"/><br /><sub><b>♡</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=bt3gl" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/LuisUrrutia"><img src="https://avatars.githubusercontent.com/u/3771248?v=4?s=100" width="100px;" alt="Luis Sebastian Urrutia Fuentes"/><br /><sub><b>Luis Sebastian Urrutia Fuentes</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=LuisUrrutia" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/jakubalsoori"><img src="https://avatars.githubusercontent.com/u/93258205?v=4?s=100" width="100px;" alt="jakubalsoori"/><br /><sub><b>jakubalsoori</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=jakubalsoori" title="Documentation">📖</a></td>
Expand Down Expand Up @@ -1469,10 +1469,19 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="http://frankiefab.com"><img src="https://avatars.githubusercontent.com/u/46662771?v=4?s=100" width="100px;" alt="Franklin Ohaegbulam"/><br /><sub><b>Franklin Ohaegbulam</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=frankiefab100" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/soos3d"><img src="https://avatars.githubusercontent.com/u/99700157?v=4?s=100" width="100px;" alt="Soos3D"/><br /><sub><b>Soos3D</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=soos3d" title="Documentation">📖</a></td>
<td align="center"><a href="http://keybase.io/minhoryang"><img src="https://avatars.githubusercontent.com/u/1270855?v=4?s=100" width="100px;" alt="Minho Ryang"/><br /><sub><b>Minho Ryang</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=minhoryang" title="Code">💻</a></td>
<td align="center"><a href="https://sebastiansupreme.eth.link"><img src="https://avatars.githubusercontent.com/u/106926150?v=4?s=100" width="100px;" alt="Sebastian Supreme"/><br /><sub><b>Sebastian Supreme</b></sub></a><br /><a href="#ideas-SebastianSupreme" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center"><a href="https://sebastiansupreme.eth.link"><img src="https://avatars.githubusercontent.com/u/106926150?v=4?s=100" width="100px;" alt="Sebastian Supreme"/><br /><sub><b>Sebastian Supreme</b></sub></a><br /><a href="#ideas-SebastianSupreme" title="Ideas, Planning, & Feedback">🤔</a> <a href="#translation-SebastianSupreme" title="Translation">🌍</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/jhhornn"><img src="https://avatars.githubusercontent.com/u/66667958?v=4?s=100" width="100px;" alt="Awosise Oluwaseun"/><br /><sub><b>Awosise Oluwaseun</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=jhhornn" title="Documentation">📖</a></td>
<td align="center"><a href="https://mahmad.netlify.app/"><img src="https://avatars.githubusercontent.com/u/75790323?v=4?s=100" width="100px;" alt="Muhammad Ahmad"/><br /><sub><b>Muhammad Ahmad</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Mahmadabid" title="Code">💻</a></td>
<td align="center"><a href="http://oliverrr.net"><img src="https://avatars.githubusercontent.com/u/32515201?v=4?s=100" width="100px;" alt="Oliver"/><br /><sub><b>Oliver</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=this-oliver" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/jiOnederfull"><img src="https://avatars.githubusercontent.com/u/48719289?v=4?s=100" width="100px;" alt="Jiwon Park"/><br /><sub><b>Jiwon Park</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=jiOnederfull" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/ZandtLavish"><img src="https://avatars.githubusercontent.com/u/99204971?v=4?s=100" width="100px;" alt="Zandt Lavish"/><br /><sub><b>Zandt Lavish</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ZandtLavish" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/issa-me-sush"><img src="https://avatars.githubusercontent.com/u/29679285?v=4?s=100" width="100px;" alt="sushthecoda"/><br /><sub><b>sushthecoda</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=issa-me-sush" title="Documentation">📖</a></td>
<td align="center"><a href="http://pentestify.io"><img src="https://avatars.githubusercontent.com/u/25382998?v=4?s=100" width="100px;" alt="Lucas Martin Calderon"/><br /><sub><b>Lucas Martin Calderon</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=LucasMartinCalderon" title="Documentation">📖</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/crypto8893"><img src="https://avatars.githubusercontent.com/u/115051650?v=4?s=100" width="100px;" alt="crypto8893"/><br /><sub><b>crypto8893</b></sub></a><br /><a href="#content-crypto8893" title="Content">🖋</a></td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ethereum-org-website",
"version": "6.7.6",
"version": "6.8.0",
"description": "Website of ethereum.org",
"main": "index.js",
"repository": "[email protected]:ethereum/ethereum-org-website.git",
Expand Down
30 changes: 25 additions & 5 deletions src/@chakra-ui/gatsby-plugin/components/Button.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
import type { ComponentStyleConfig } from "@chakra-ui/theme"

const disabledStylesSolid = {
bg: "disabled",
opacity: 1,
}

const disabledStylesOutline = {
color: "disabled",
borderColor: "disabled",
opacity: 1,
}

const commonOutline = {
border: "1px",
color: "text",
Expand All @@ -9,6 +20,9 @@ const commonOutline = {
color: "primary",
bg: "background",
borderColor: "primary",
_disabled: {
...disabledStylesOutline,
},
},
_active: {
color: "primary",
Expand All @@ -18,11 +32,12 @@ const commonOutline = {
_focus: {
color: "primary",
borderColor: "background",
_disabled: {
...disabledStylesOutline,
},
},
_disabled: {
color: "disabled",
borderColor: "disabled",
opacity: 1,
...disabledStylesOutline,
},
}

Expand All @@ -33,6 +48,9 @@ export const Button: ComponentStyleConfig = {
_hover: {
textDecoration: "none",
boxShadow: "primary",
_disabled: {
boxShadow: "none",
},
},
_focus: {
boxShadow: "outline",
Expand All @@ -53,13 +71,15 @@ export const Button: ComponentStyleConfig = {
_hover: {
bg: "primary",
opacity: 0.8,
_disabled: {
...disabledStylesSolid,
},
},
_active: {
bg: "primaryHover",
},
_disabled: {
bg: "disabled",
opacity: 1,
...disabledStylesSolid,
},
},
outline: {
Expand Down
5 changes: 5 additions & 0 deletions src/@chakra-ui/gatsby-plugin/foundations/colors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,15 @@ const colors = {
800: "#451900",
},
red: {
100: "#F7C8C8",
500: "#b80000",
900: "#1B0C0C",
},
green: {
100: "#C8F7D8",
400: "#48BB78",
500: "#109e62",
900: "#0A160E",
},
yellow: {
200: "#fff8df",
Expand Down
1 change: 1 addition & 0 deletions src/@chakra-ui/gatsby-plugin/foundations/shadows.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const shadows = {
outline: "0 0 0 4px var(--eth-colors-primaryHover)",
table:
"0 14px 66px rgba(0,0,0,.07), 0 10px 17px rgba(0,0,0,.03), 0 4px 7px rgba(0,0,0,.05)",
drop: "0 4px 17px 0 var(--eth-colors-blackAlpha-200)",
tableBox: {
light:
"0 14px 66px rgba(0,0,0,.07), 0 10px 17px rgba(0,0,0,.03), 0 4px 7px rgba(0,0,0,.05)",
Expand Down
7 changes: 6 additions & 1 deletion src/@chakra-ui/gatsby-plugin/semanticTokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,17 @@ const semanticTokens = {
primaryLight: { _light: "blue.100", _dark: "orange.100" },
primaryDark: { _light: "blue.700", _dark: "orange.800" },
primaryHover: { _light: "blue.300", _dark: "orange.300" },
primaryPressed: { _light: "blue.300", _dark: "orange.800" },
body: { _light: "gray.700", _dark: "gray.100" },
bodyInverted: { _light: "gray.100", _dark: "gray.700" },
bodyLight: { _light: "gray.500", _dark: "gray.100" },
disabled: { _light: "gray.400", _dark: "gray.500" },
background: { _light: "white", _dark: "gray.700" },
success: "green.500",
neutral: { _light: "white", _dark: "gray.900" },
success: { _light: "green.500", _dark: "green.400" },
successNeutral: { _light: "green.100", _dark: "green.900" },
error: "red.500",
errorNeutral: { _light: "red.100", _dark: "red.900" },
attention: "yellow.200",
},
}
Expand Down
3 changes: 3 additions & 0 deletions src/assets/quiz/correct.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/quiz/incorrect.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions src/assets/quiz/star-confetti.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0e740f8

Please sign in to comment.