Skip to content

Commit f7cfe7d

Browse files
pettinarippettinarip
committed
Merge branch 'dev' into feat/chakra-gatsby-image
2 parents b4a77f2 + f69a884 commit f7cfe7d

File tree

14 files changed

+110
-40
lines changed

14 files changed

+110
-40
lines changed

‎.all-contributorsrc‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10523,6 +10523,42 @@
1052310523
"contributions": [
1052410524
"bug"
1052510525
]
10526+
},
10527+
{
10528+
"login": "0xMimir",
10529+
"name": "0xMimir",
10530+
"avatar_url": "https://avatars.githubusercontent.com/u/108837858?v=4",
10531+
"profile": "https://github.com/0xMimir",
10532+
"contributions": [
10533+
"content"
10534+
]
10535+
},
10536+
{
10537+
"login": "bilaljawed",
10538+
"name": "Bilal",
10539+
"avatar_url": "https://avatars.githubusercontent.com/u/17548944?v=4",
10540+
"profile": "https://github.com/bilaljawed",
10541+
"contributions": [
10542+
"content"
10543+
]
10544+
},
10545+
{
10546+
"login": "ilanolkies",
10547+
"name": "Ilan",
10548+
"avatar_url": "https://avatars.githubusercontent.com/u/36084092?v=4",
10549+
"profile": "https://ilanolkies.com",
10550+
"contributions": [
10551+
"content"
10552+
]
10553+
},
10554+
{
10555+
"login": "umededoteth",
10556+
"name": "umede",
10557+
"avatar_url": "https://avatars.githubusercontent.com/u/122288558?v=4",
10558+
"profile": "https://mirror.xyz/umede.eth",
10559+
"contributions": [
10560+
"content"
10561+
]
1052610562
}
1052710563
],
1052810564
"contributorsPerLine": 7,

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,6 +1643,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
16431643
<td align="center" valign="top" width="14.28%"><a href="https://linktr.ee/kritik"><img src="https://avatars.githubusercontent.com/u/57076429?v=4?s=100" width="100px;" alt="kritik sah"/><br /><sub><b>kritik sah</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Akritik-sah" title="Bug reports">🐛</a></td>
16441644
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuliggine"><img src="https://avatars.githubusercontent.com/u/56844974?v=4?s=100" width="100px;" alt="Fuliggine"/><br /><sub><b>Fuliggine</b></sub></a><br /><a href="#content-Fuliggine" title="Content">🖋</a></td>
16451645
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Omsify"><img src="https://avatars.githubusercontent.com/u/87442202?v=4?s=100" width="100px;" alt="Omsify"/><br /><sub><b>Omsify</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AOmsify" title="Bug reports">🐛</a></td>
1646+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/0xMimir"><img src="https://avatars.githubusercontent.com/u/108837858?v=4?s=100" width="100px;" alt="0xMimir"/><br /><sub><b>0xMimir</b></sub></a><br /><a href="#content-0xMimir" title="Content">🖋</a></td>
1647+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bilaljawed"><img src="https://avatars.githubusercontent.com/u/17548944?v=4?s=100" width="100px;" alt="Bilal"/><br /><sub><b>Bilal</b></sub></a><br /><a href="#content-bilaljawed" title="Content">🖋</a></td>
1648+
</tr>
1649+
<tr>
1650+
<td align="center" valign="top" width="14.28%"><a href="https://ilanolkies.com"><img src="https://avatars.githubusercontent.com/u/36084092?v=4?s=100" width="100px;" alt="Ilan"/><br /><sub><b>Ilan</b></sub></a><br /><a href="#content-ilanolkies" title="Content">🖋</a></td>
1651+
<td align="center" valign="top" width="14.28%"><a href="https://mirror.xyz/umede.eth"><img src="https://avatars.githubusercontent.com/u/122288558?v=4?s=100" width="100px;" alt="umede"/><br /><sub><b>umede</b></sub></a><br /><a href="#content-umededoteth" title="Content">🖋</a></td>
16461652
</tr>
16471653
</tbody>
16481654
</table>

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,30 @@ const styles = {
2929
},
3030
// imported global CSS styles for list items
3131
li: {
32-
"margin-bottom": "calc(1.45rem / 2)",
32+
marginBottom: "calc(1.45rem / 2)",
3333
},
3434
"ol li": {
35-
"padding-left": "0",
35+
paddingInlineStart: "0",
3636
},
3737
"ul li": {
38-
"padding-left": "0",
38+
paddingInlineStart: "0",
3939
},
4040
"li > ol": {
41-
"margin-left": "1.45rem",
42-
"margin-bottom": "calc(1.45rem / 2)",
43-
"margin-top": "calc(1.45rem / 2)",
41+
marginInlineStart: "1.45rem",
42+
marginBottom: "calc(1.45rem / 2)",
43+
marginTop: "calc(1.45rem / 2)",
4444
},
4545
"li > ul": {
46-
"margin-left": "1.45rem",
47-
"margin-bottom": "calc(1.45rem / 2)",
48-
"margin-top": "calc(1.45rem / 2)",
46+
marginInlineStart: "1.45rem",
47+
marginBottom: "calc(1.45rem / 2)",
48+
marginTop: "calc(1.45rem / 2)",
4949
},
5050

5151
"li *:last-child": {
52-
"margin-bottom": "0",
52+
marginBottom: "0",
5353
},
5454
"li > p": {
55-
"margin-bottom": "calc(1.45rem / 2)",
55+
marginBottom: "calc(1.45rem / 2)",
5656
},
5757
// Anchor tag styles
5858
// Selected specifically for mdx rendered side icon link

‎src/assets/wallets/linen.png‎

195 Bytes
Loading

‎src/components/Roadmap/RoadmapActionCard.tsx‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
import React from "react"
22
import { useStaticQuery, graphql } from "gatsby"
3-
import { Box, Center, Flex, LinkBox, LinkOverlay } from "@chakra-ui/react"
3+
import {
4+
Text,
5+
Center,
6+
Flex,
7+
Heading,
8+
LinkBox,
9+
LinkOverlay,
10+
} from "@chakra-ui/react"
411

512
import { getImage } from "../../utils/image"
613

714
import ButtonLink from "../ButtonLink"
8-
import Text from "../OldText"
915
import GatsbyImage from "../GatsbyImage"
1016

1117
interface IProps {
@@ -77,7 +83,6 @@ const RoadmapActionCard: React.FC<IProps> = ({
7783
<LinkBox
7884
as={Flex}
7985
direction="column"
80-
justifyContent="space-between"
8186
border="1px solid"
8287
borderColor="lightBorder"
8388
>
@@ -88,13 +93,15 @@ const RoadmapActionCard: React.FC<IProps> = ({
8893
objectFit="contain"
8994
/>
9095
</Center>
91-
<Box p={6}>
92-
<Text as="h3">{title}</Text>
93-
<Text>{description}</Text>
96+
<Flex p={6} flex="1" flexDir="column" justify="space-between" gap={4}>
97+
<Heading as="h3" size="md">
98+
{title}
99+
</Heading>
100+
<Text flex="1">{description}</Text>
94101
<LinkOverlay as={ButtonLink} href={to}>
95102
{buttonText}
96103
</LinkOverlay>
97-
</Box>
104+
</Flex>
98105
</LinkBox>
99106
)
100107
}

‎src/content/community/grants/index.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ These programs support the broad Ethereum ecosystem by offering grants to a wide
2222
- [DAO Grants](https://docs.google.com/spreadsheets/d/1XHc-p_MHNRdjacc8uOEjtPoWL86olP4GyxAJOFO0zxY/edit#gid=0) - _Google spreadsheet of organizations offering grants_
2323
- [Crunchbase for Web3 Grants](https://www.cryptoneur.xyz/web3-grants) - _Filter and search for grants by category, use case, amount, and more. Contribute to help others find the right grant._
2424
- [Academic Grants](https://esp.ethereum.foundation/academic-grants) - _Grants to support Ethereum-related academic work_
25+
- [Blockworks Grantfarm](https://blockworks.co/grants/programs) - \_Blockworks has compiled a comprehensive directory of all grants, RFPs, and bug bounties.
2526

2627
## Project specific {#project-specific}
2728

@@ -38,7 +39,7 @@ These projects have created their own grants for projects aimed at developing an
3839
- [SKALE Network Grants Program](https://skale.space/developers#grants) - _[SKALE Network](https://skale.space/) ecosystem_
3940
- [The Graph](https://airtable.com/shrdfvnFvVch3IOVm) – _[The Graph](https://thegraph.com/) ecosystem_
4041
- [UMA Grants Program](https://grants.umaproject.org/) - _[UMA](https://umaproject.org/) developer support_
41-
- [Uniswap Grants Program](https://www.unigrants.org/) – _[Uniswap](https://uniswap.org/) community_
42+
- [Uniswap Grants Program](https://www.uniswapfoundation.org/grants) - _[Uniswap](https://uniswap.org/) community_
4243
- [Web3 Grants](https://web3grants.net) - _An extensive list of web3/crypto related grant programs_
4344

4445
## Quadratic funding {#quadratic-funding}

‎src/content/developers/docs/bridges/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ For developers, bridges enable the following:
3030

3131
## How do bridges work? {#how-do-bridges-work}
3232

33-
While there are many [types of bridge designs](https://blog.li.fi/what-are-blockchain-bridges-and-how-can-we-classify-them-560dc6ec05fa), three ways to facilitate the cross-chain transfer of assets stand out:
33+
While there are many [types of bridge designs](https://li.fi/knowledge-hub/blockchain-bridges-and-classification/), three ways to facilitate the cross-chain transfer of assets stand out:
3434

3535
- **Lock and mint –** Lock assets on the source chain and mint assets on the destination chain.
3636
- **Burn and mint –** Burn assets on the source chain and mint assets on the destination chain.

‎src/content/developers/docs/data-structures-and-encoding/rlp/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RLP encoding is defined as follows:
3535
- For a single byte whose value is in the `[0x00, 0x7f]` (decimal `[0, 127]`) range, that byte is its own RLP encoding.
3636
- Otherwise, if a string is 0-55 bytes long, the RLP encoding consists of a single byte with value **0x80** (dec. 128) plus the length of the string followed by the string. The range of the first byte is thus `[0x80, 0xb7]` (dec. `[128, 183]`).
3737
- If a string is more than 55 bytes long, the RLP encoding consists of a single byte with value **0xb7** (dec. 183) plus the length in bytes of the length of the string in binary form, followed by the length of the string, followed by the string. For example, a 1024 byte long string would be encoded as `\xb9\x04\x00` (dec. `185, 4, 0`) followed by the string. Here, `0xb9` (183 + 2 = 185) as the first byte, followed by the 2 bytes `0x0400` (dec. 1024) that denote the length of the actual string. The range of the first byte is thus `[0xb8, 0xbf]` (dec. `[184, 191]`).
38-
- If the total payload of a list (i.e. the combined length of all its items being RLP encoded) is 0-55 bytes long, the RLP encoding consists of a single byte with value **0xc0** plus the length of the list followed by the concatenation of the RLP encodings of the items. The range of the first byte is thus `[0xc0, 0xf7]` (dec. `[192, 247]`).
38+
- If the total payload of a list (i.e. the combined length of all its items being RLP encoded) is 0-55 bytes long, the RLP encoding consists of a single byte with value **0xc0** plus the length of the payload followed by the concatenation of the RLP encodings of the items. The range of the first byte is thus `[0xc0, 0xf7]` (dec. `[192, 247]`).
3939
- If the total payload of a list is more than 55 bytes long, the RLP encoding consists of a single byte with value **0xf7** plus the length in bytes of the length of the payload in binary form, followed by the length of the payload, followed by the concatenation of the RLP encodings of the items. The range of the first byte is thus `[0xf8, 0xff]` (dec. `[248, 255]`).
4040

4141
In code, this is:

‎src/content/developers/docs/nodes-and-clients/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ If you want to [run your own node](/developers/docs/nodes-and-clients/run-a-node
5656

5757
### Full node {#full-node}
5858

59-
Full nodes do a block-by-block validation of the blockchain, including downloading and verifying the block body and state data for each block. There are different classes of full node - some start from the genesis block and verify every single block in the entie history of the blockchain. Others start their verification at a more recent block that they trust to be valid (e.g. Geth's 'snap sync'). Regardless of where the verification starts, full nodes only keep a local copy of relatively recent data (typically the most recent 128 blocks), allowing older data to be deleted to save disk space. Older data can be regenerated when it is needed.
59+
Full nodes do a block-by-block validation of the blockchain, including downloading and verifying the block body and state data for each block. There are different classes of full node - some start from the genesis block and verify every single block in the entire history of the blockchain. Others start their verification at a more recent block that they trust to be valid (e.g. Geth's 'snap sync'). Regardless of where the verification starts, full nodes only keep a local copy of relatively recent data (typically the most recent 128 blocks), allowing older data to be deleted to save disk space. Older data can be regenerated when it is needed.
6060

6161
- Stores full blockchain data (although this is periodically pruned so a full node does not store all state data back to genesis)
6262
- Participates in block validation, verifies all blocks and states.

‎src/data/community-events.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@
88
"startDate": "2023-10-21",
99
"endDate": "2023-10-21"
1010
},
11+
{
12+
"title": "ETHDubai",
13+
"to": "https://www.ethdubaiconf.org/",
14+
"sponsor": null,
15+
"location": "Dubai, UAE",
16+
"description": "The Ethereum dev conference and hackathon in Dubai on everything DeFi, privacy, EVM scaling, layers 2, Account Abstraction and more with a focus on decentralization and community projects. We also organize a Demo Pitch Day with VCs.",
17+
"startDate": "2024-04-19",
18+
"endDate": "2024-04-21"
19+
},
1120
{
1221
"title": "Ethereum Rio",
1322
"to": "https://www.ethereumbrasil.com/",
@@ -364,8 +373,17 @@
364373
"to": "https://ethglobal.com/events/pragma-newyork",
365374
"sponsor": null,
366375
"location": "New York, New York",
367-
"description": "ETHGlobal Pragma is an in-person summit for builders and leaders in the web3 ecosystem",
376+
"description": "Pragma New York is an in-person summit for builders and leaders in the web3 ecosystem",
368377
"startDate": "2023-09-21",
369378
"endDate": "2023-09-21"
379+
},
380+
{
381+
"title": "Pragma Istanbul",
382+
"to": "https://ethglobal.com/events/pragma-istanbul",
383+
"sponsor": null,
384+
"location": "Istanbul, Turkey",
385+
"description": "Pragma Istanbul is an in-person summit for builders and leaders in the web3 ecosystem",
386+
"startDate": "2023-11-16",
387+
"endDate": "2023-11-16"
370388
}
371389
]

0 commit comments

Comments
 (0)