Skip to content

Commit fd5b85e

Browse files
wackerowwackerow
authored
Merge pull request #8432 from ethereum/dev
2 parents 0e740f8 + db47b8d commit fd5b85e

File tree

87 files changed

+751
-524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+751
-524
lines changed

‎.all-contributorsrc‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9399,6 +9399,105 @@
93999399
"contributions": [
94009400
"content"
94019401
]
9402+
},
9403+
{
9404+
"login": "victorpatru",
9405+
"name": "Victor Patru",
9406+
"avatar_url": "https://avatars.githubusercontent.com/u/102596893?v=4",
9407+
"profile": "http://victorpatru.xyz",
9408+
"contributions": [
9409+
"code"
9410+
]
9411+
},
9412+
{
9413+
"login": "vaishnav-mk",
9414+
"name": "wishee",
9415+
"avatar_url": "https://avatars.githubusercontent.com/u/84540554?v=4",
9416+
"profile": "https://vaishnav.tech",
9417+
"contributions": [
9418+
"doc"
9419+
]
9420+
},
9421+
{
9422+
"login": "Harshil-Gupta",
9423+
"name": "Harshil Gupta",
9424+
"avatar_url": "https://avatars.githubusercontent.com/u/53968071?v=4",
9425+
"profile": "https://github.com/Harshil-Gupta",
9426+
"contributions": [
9427+
"doc"
9428+
]
9429+
},
9430+
{
9431+
"login": "vanshika-srivastava",
9432+
"name": "Vanshika Srivastava",
9433+
"avatar_url": "https://avatars.githubusercontent.com/u/76511019?v=4",
9434+
"profile": "https://github.com/vanshika-srivastava",
9435+
"contributions": [
9436+
"ideas"
9437+
]
9438+
},
9439+
{
9440+
"login": "shariqanwar20",
9441+
"name": "Shariq Anwar",
9442+
"avatar_url": "https://avatars.githubusercontent.com/u/61353122?v=4",
9443+
"profile": "https://github.com/shariqanwar20",
9444+
"contributions": [
9445+
"code"
9446+
]
9447+
},
9448+
{
9449+
"login": "giorgionocera",
9450+
"name": "Giorgio Nocera",
9451+
"avatar_url": "https://avatars.githubusercontent.com/u/13519292?v=4",
9452+
"profile": "https://github.com/giorgionocera",
9453+
"contributions": [
9454+
"doc"
9455+
]
9456+
},
9457+
{
9458+
"login": "alexeevcc",
9459+
"name": "Dmitry Alexeev",
9460+
"avatar_url": "https://avatars.githubusercontent.com/u/61043916?v=4",
9461+
"profile": "https://cyberacademy.dev",
9462+
"contributions": [
9463+
"content"
9464+
]
9465+
},
9466+
{
9467+
"login": "af-afk",
9468+
"name": "Alex",
9469+
"avatar_url": "https://avatars.githubusercontent.com/u/71931113?v=4",
9470+
"profile": "https://github.com/af-afk",
9471+
"contributions": [
9472+
"doc"
9473+
]
9474+
},
9475+
{
9476+
"login": "benlazzero",
9477+
"name": "benlazzero",
9478+
"avatar_url": "https://avatars.githubusercontent.com/u/85390423?v=4",
9479+
"profile": "https://github.com/benlazzero",
9480+
"contributions": [
9481+
"code"
9482+
]
9483+
},
9484+
{
9485+
"login": "ankitzm",
9486+
"name": "Ankit Singh",
9487+
"avatar_url": "https://avatars.githubusercontent.com/u/66105983?v=4",
9488+
"profile": "https://github.com/ankitzm",
9489+
"contributions": [
9490+
"code"
9491+
]
9492+
},
9493+
{
9494+
"login": "mhairimcalpine",
9495+
"name": "mhairimcalpine",
9496+
"avatar_url": "https://avatars.githubusercontent.com/u/76955258?v=4",
9497+
"profile": "https://github.com/mhairimcalpine",
9498+
"contributions": [
9499+
"content"
9500+
]
94029501
}
94039502
],
94049503
"contributorsPerLine": 7,

‎README.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1482,6 +1482,19 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
14821482
</tr>
14831483
<tr>
14841484
<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>
1485+
<td align="center"><a href="http://victorpatru.xyz"><img src="https://avatars.githubusercontent.com/u/102596893?v=4?s=100" width="100px;" alt="Victor Patru"/><br /><sub><b>Victor Patru</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=victorpatru" title="Code">💻</a></td>
1486+
<td align="center"><a href="https://vaishnav.tech"><img src="https://avatars.githubusercontent.com/u/84540554?v=4?s=100" width="100px;" alt="wishee"/><br /><sub><b>wishee</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vaishnav-mk" title="Documentation">📖</a></td>
1487+
<td align="center"><a href="https://github.com/Harshil-Gupta"><img src="https://avatars.githubusercontent.com/u/53968071?v=4?s=100" width="100px;" alt="Harshil Gupta"/><br /><sub><b>Harshil Gupta</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Harshil-Gupta" title="Documentation">📖</a></td>
1488+
<td align="center"><a href="https://github.com/vanshika-srivastava"><img src="https://avatars.githubusercontent.com/u/76511019?v=4?s=100" width="100px;" alt="Vanshika Srivastava"/><br /><sub><b>Vanshika Srivastava</b></sub></a><br /><a href="#ideas-vanshika-srivastava" title="Ideas, Planning, & Feedback">🤔</a></td>
1489+
<td align="center"><a href="https://github.com/shariqanwar20"><img src="https://avatars.githubusercontent.com/u/61353122?v=4?s=100" width="100px;" alt="Shariq Anwar"/><br /><sub><b>Shariq Anwar</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=shariqanwar20" title="Code">💻</a></td>
1490+
<td align="center"><a href="https://github.com/giorgionocera"><img src="https://avatars.githubusercontent.com/u/13519292?v=4?s=100" width="100px;" alt="Giorgio Nocera"/><br /><sub><b>Giorgio Nocera</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=giorgionocera" title="Documentation">📖</a></td>
1491+
</tr>
1492+
<tr>
1493+
<td align="center"><a href="https://cyberacademy.dev"><img src="https://avatars.githubusercontent.com/u/61043916?v=4?s=100" width="100px;" alt="Dmitry Alexeev"/><br /><sub><b>Dmitry Alexeev</b></sub></a><br /><a href="#content-alexeevcc" title="Content">🖋</a></td>
1494+
<td align="center"><a href="https://github.com/af-afk"><img src="https://avatars.githubusercontent.com/u/71931113?v=4?s=100" width="100px;" alt="Alex"/><br /><sub><b>Alex</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=af-afk" title="Documentation">📖</a></td>
1495+
<td align="center"><a href="https://github.com/benlazzero"><img src="https://avatars.githubusercontent.com/u/85390423?v=4?s=100" width="100px;" alt="benlazzero"/><br /><sub><b>benlazzero</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=benlazzero" title="Code">💻</a></td>
1496+
<td align="center"><a href="https://github.com/ankitzm"><img src="https://avatars.githubusercontent.com/u/66105983?v=4?s=100" width="100px;" alt="Ankit Singh"/><br /><sub><b>Ankit Singh</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ankitzm" title="Code">💻</a></td>
1497+
<td align="center"><a href="https://github.com/mhairimcalpine"><img src="https://avatars.githubusercontent.com/u/76955258?v=4?s=100" width="100px;" alt="mhairimcalpine"/><br /><sub><b>mhairimcalpine</b></sub></a><br /><a href="#content-mhairimcalpine" title="Content">🖋</a></td>
14851498
</tr>
14861499
</tbody>
14871500
</table>

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "6.8.0",
3+
"version": "6.8.1",
44
"description": "Website of ethereum.org",
55
"main": "index.js",
66
"repository": "[email protected]:ethereum/ethereum-org-website.git",

‎src/assets/dapps/pwn.png‎

3.49 KB
Loading

‎src/assets/wallets/gridplus.png‎

30.9 KB
Loading

‎src/components/CallToContribute.tsx‎

Lines changed: 95 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Flex, Heading, Icon, Text } from "@chakra-ui/react"
1+
import { Flex, Heading, Icon, Show, Text, useToken } from "@chakra-ui/react"
22
import { FaGithub } from "react-icons/fa"
3-
import React from "react"
3+
import React, { ReactNode } from "react"
44
import Link from "./Link"
55
import ButtonLink from "./ButtonLink"
66

@@ -10,85 +10,103 @@ export interface IProps {
1010
editPath: string
1111
}
1212

13-
const CallToContribute: React.FC<IProps> = ({ editPath }) => (
13+
export type ChildOnlyType = {
14+
children: ReactNode
15+
}
16+
17+
const ContentColumn = ({ children }: ChildOnlyType) => (
1418
<Flex
15-
bg="ednBackground"
16-
align="center"
17-
mt={8}
18-
border="1px"
19-
borderColor="primary"
20-
borderRadius="base"
21-
boxShadow="inset 0 -2px 0 0 var(--eth-colors-primary400)"
19+
direction="column"
20+
flexGrow={1}
21+
flexShrink={1}
22+
flexBasis="50%"
23+
p={4}
24+
color="text"
25+
textAlign={{ base: "center", lg: "left" }}
2226
>
27+
{children}
28+
</Flex>
29+
)
30+
31+
const DescriptionParagraph = ({ children }: ChildOnlyType) => (
32+
<Text lineHeight="140%" color="text" fontFamily="monospace">
33+
{children}
34+
</Text>
35+
)
36+
37+
const CallToContribute: React.FC<IProps> = ({ editPath }) => {
38+
/**
39+
* TODO: After completion of the UI migration,
40+
* Remove this and pass the token value directly
41+
* into the `above` prop of `Show`
42+
*/
43+
const largeBp = useToken("breakpoints", "lg")
44+
45+
return (
2346
<Flex
24-
direction="column"
25-
flexGrow={1}
26-
flexShrink={1}
27-
flexBasis="50%"
28-
p={4}
29-
color="text"
30-
textAlign={{ base: "center", lg: "left" }}
31-
display={{ base: "none", lg: "flex" }}
32-
>
33-
░░░░░░░░░▄░░░░░░░░░░░░░░▄░░░░ ░░░░░░░░▌▒█░░░░░░░░░░░▄▀▒▌░░░
34-
░░░░░░░░▌▒▒█░░░░░░░░▄▀▒▒▒▐░░░ ░░░░░░░▐▄▀▒▒▀▀▀▀▄▄▄▀▒▒▒▒▒▐░░░
35-
░░░░░▄▄▀▒░▒▒▒▒▒▒▒▒▒█▒▒▄█▒▐░░░ ░░░▄▀▒▒▒░░░▒▒▒░░░▒▒▒▀██▀▒▌░░░
36-
░░▐▒▒▒▄▄▒▒▒▒░░░▒▒▒▒▒▒▒▀▄▒▒▌░░ ░░▌░░▌█▀▒▒▒▒▒▄▀█▄▒▒▒▒▒▒▒█▒▐░░
37-
░▐░░░▒▒▒▒▒▒▒▒▌██▀▒▒░░░▒▒▒▀▄▌░ ░▌░▒▄██▄▒▒▒▒▒▒▒▒▒░░░░░░▒▒▒▒▌░
38-
▀▒▀▐▄█▄█▌▄░▀▒▒░░░░░░░░░░▒▒▒▐░ ▐▒▒▐▀▐▀▒░▄▄▒▄▒▒▒▒▒▒░▒░▒░▒▒▒▒▌
39-
▐▒▒▒▀▀▄▄▒▒▒▄▒▒▒▒▒▒▒▒░▒░▒░▒▒▐░ ░▌▒▒▒▒▒▒▀▀▀▒▒▒▒▒▒░▒░▒░▒░▒▒▒▌░
40-
░▐▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▒▄▒▒▐░░ ░░▀▄▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▄▒▒▒▒▌░░
41-
░░░░▀▄▒▒▒▒▒▒▒▒▒▒▄▄▄▀▒▒▒▒▄▀░░░ ░░░░░░▀▄▄▄▄▄▄▀▀▀▒▒▒▒▒▄▄▀░░░░░
42-
░░░░░░░░░▒▒▒▒▒▒▒▒▒▒▀▀░░░░░░░░
43-
</Flex>
44-
<Flex
45-
direction="column"
46-
flexGrow={1}
47-
flexShrink={1}
48-
flexBasis="50%"
49-
p={4}
50-
color="text"
51-
textAlign={{ base: "center", lg: "left" }}
47+
bg="ednBackground"
48+
align="center"
49+
mt={8}
50+
border="1px"
51+
borderColor="primary"
52+
borderRadius="base"
53+
boxShadow="inset 0 -2px 0 0 var(--eth-colors-primary400)"
5254
>
53-
<Heading
54-
as="h2"
55-
fontFamily="monospace"
56-
textTransform="uppercase"
57-
bg="border"
58-
p={1}
59-
fontSize="2rem"
60-
lineHeight={1.4}
61-
>
62-
<Translation id="page-calltocontribute-title" />
63-
</Heading>
64-
<Text lineHeight="140%" color="text" fontFamily="monospace">
65-
<Translation id="page-calltocontribute-desc-1" />
66-
</Text>
67-
<Text lineHeight="140%" color="text" fontFamily="monospace">
68-
<Translation id="page-calltocontribute-desc-2" />
69-
</Text>
70-
<Text lineHeight="140%" color="text" fontFamily="monospace">
71-
<Translation id="page-calltocontribute-desc-3" />{" "}
72-
<Link to="https://www.notion.so/efdn/Writer-template-4b40d196cde7422ca6a2091de33550bd">
73-
<Translation id="page-calltocontribute-link" />
74-
</Link>
75-
</Text>
76-
<Text lineHeight="140%" color="text" fontFamily="monospace">
77-
<Translation id="page-calltocontribute-desc-4" />{" "}
78-
<Link to="https://discord.gg/CetY6Y4">
79-
<Translation id="page-calltocontribute-link-2" />
80-
</Link>{" "}
81-
</Text>
82-
<ButtonLink
83-
to={editPath}
84-
leftIcon={
85-
<Icon fill="background" w={6} h={6} as={FaGithub} name="github" />
86-
}
87-
>
88-
<Translation id="page-calltocontribute-span" />
89-
</ButtonLink>
55+
<Show above={largeBp}>
56+
<ContentColumn>
57+
░░░░░░░░░▄░░░░░░░░░░░░░░▄░░░░ ░░░░░░░░▌▒█░░░░░░░░░░░▄▀▒▌░░░
58+
░░░░░░░░▌▒▒█░░░░░░░░▄▀▒▒▒▐░░░ ░░░░░░░▐▄▀▒▒▀▀▀▀▄▄▄▀▒▒▒▒▒▐░░░
59+
░░░░░▄▄▀▒░▒▒▒▒▒▒▒▒▒█▒▒▄█▒▐░░░ ░░░▄▀▒▒▒░░░▒▒▒░░░▒▒▒▀██▀▒▌░░░
60+
░░▐▒▒▒▄▄▒▒▒▒░░░▒▒▒▒▒▒▒▀▄▒▒▌░░ ░░▌░░▌█▀▒▒▒▒▒▄▀█▄▒▒▒▒▒▒▒█▒▐░░
61+
░▐░░░▒▒▒▒▒▒▒▒▌██▀▒▒░░░▒▒▒▀▄▌░ ░▌░▒▄██▄▒▒▒▒▒▒▒▒▒░░░░░░▒▒▒▒▌░
62+
▀▒▀▐▄█▄█▌▄░▀▒▒░░░░░░░░░░▒▒▒▐░ ▐▒▒▐▀▐▀▒░▄▄▒▄▒▒▒▒▒▒░▒░▒░▒▒▒▒▌
63+
▐▒▒▒▀▀▄▄▒▒▒▄▒▒▒▒▒▒▒▒░▒░▒░▒▒▐░ ░▌▒▒▒▒▒▒▀▀▀▒▒▒▒▒▒░▒░▒░▒░▒▒▒▌░
64+
░▐▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▒▄▒▒▐░░ ░░▀▄▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▄▒▒▒▒▌░░
65+
░░░░▀▄▒▒▒▒▒▒▒▒▒▒▄▄▄▀▒▒▒▒▄▀░░░ ░░░░░░▀▄▄▄▄▄▄▀▀▀▒▒▒▒▒▄▄▀░░░░░
66+
░░░░░░░░░▒▒▒▒▒▒▒▒▒▒▀▀░░░░░░░░
67+
</ContentColumn>
68+
</Show>
69+
<ContentColumn>
70+
<Heading
71+
as="h2"
72+
fontFamily="monospace"
73+
textTransform="uppercase"
74+
bg="border"
75+
p={1}
76+
fontSize="2rem"
77+
lineHeight={1.4}
78+
>
79+
<Translation id="page-calltocontribute-title" />
80+
</Heading>
81+
<DescriptionParagraph>
82+
<Translation id="page-calltocontribute-desc-1" />
83+
</DescriptionParagraph>
84+
<DescriptionParagraph>
85+
<Translation id="page-calltocontribute-desc-2" />
86+
</DescriptionParagraph>
87+
<DescriptionParagraph>
88+
<Translation id="page-calltocontribute-desc-3" />{" "}
89+
<Link to="https://www.notion.so/efdn/Writer-template-4b40d196cde7422ca6a2091de33550bd">
90+
<Translation id="page-calltocontribute-link" />
91+
</Link>
92+
</DescriptionParagraph>
93+
<DescriptionParagraph>
94+
<Translation id="page-calltocontribute-desc-4" />{" "}
95+
<Link to="https://discord.gg/CetY6Y4">
96+
<Translation id="page-calltocontribute-link-2" />
97+
</Link>{" "}
98+
</DescriptionParagraph>
99+
<ButtonLink
100+
to={editPath}
101+
leftIcon={
102+
<Icon fill="background" w={6} h={6} as={FaGithub} name="github" />
103+
}
104+
>
105+
<Translation id="page-calltocontribute-span" />
106+
</ButtonLink>
107+
</ContentColumn>
90108
</Flex>
91-
</Flex>
92-
)
109+
)
110+
}
93111

94112
export default CallToContribute

0 commit comments

Comments
 (0)