Skip to content

Commit 300afc5

Browse files
corwintinescorwintines
authored
Merge branch 'dev' into eth-london-2023
2 parents 2fa8914 + c95ece2 commit 300afc5

File tree

95 files changed

+1062
-558
lines changed

Some content is hidden

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

95 files changed

+1062
-558
lines changed

‎.all-contributorsrc

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10394,6 +10394,34 @@
1039410394
"contributions": [
1039510395
"content"
1039610396
]
10397+
},
10398+
{
10399+
"login": "woseK",
10400+
"name": "woseK",
10401+
"avatar_url": "https://avatars.githubusercontent.com/u/110729731?v=4",
10402+
"profile": "https://github.com/woseK",
10403+
"contributions": [
10404+
"content",
10405+
"bug"
10406+
]
10407+
},
10408+
{
10409+
"login": "gunal-123",
10410+
"name": "Gunal",
10411+
"avatar_url": "https://avatars.githubusercontent.com/u/103403219?v=4",
10412+
"profile": "https://github.com/gunal-123",
10413+
"contributions": [
10414+
"content"
10415+
]
10416+
},
10417+
{
10418+
"login": "LadyDhaga",
10419+
"name": "chinaman123",
10420+
"avatar_url": "https://avatars.githubusercontent.com/u/106376368?v=4",
10421+
"profile": "https://github.com/LadyDhaga",
10422+
"contributions": [
10423+
"ideas"
10424+
]
1039710425
}
1039810426
],
1039910427
"contributorsPerLine": 7,

‎README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,6 +1625,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
16251625
<td align="center" valign="top" width="14.28%"><a href="https://github.com/TucksonDev"><img src="https://avatars.githubusercontent.com/u/105675159?v=4?s=100" width="100px;" alt="Tuckson"/><br /><sub><b>Tuckson</b></sub></a><br /><a href="#content-TucksonDev" title="Content">🖋</a></td>
16261626
<td align="center" valign="top" width="14.28%"><a href="https://twitter.com/_Akamig"><img src="https://avatars.githubusercontent.com/u/6278999?v=4?s=100" width="100px;" alt="Akamig"/><br /><sub><b>Akamig</b></sub></a><br /><a href="#content-Akamig" title="Content">🖋</a></td>
16271627
<td align="center" valign="top" width="14.28%"><a href="https://github.com/perriefidelis"><img src="https://avatars.githubusercontent.com/u/30669761?v=4?s=100" width="100px;" alt="Peace Ojemeh"/><br /><sub><b>Peace Ojemeh</b></sub></a><br /><a href="#content-perriefidelis" title="Content">🖋</a></td>
1628+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/woseK"><img src="https://avatars.githubusercontent.com/u/110729731?v=4?s=100" width="100px;" alt="woseK"/><br /><sub><b>woseK</b></sub></a><br /><a href="#content-woseK" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AwoseK" title="Bug reports">🐛</a></td>
1629+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/gunal-123"><img src="https://avatars.githubusercontent.com/u/103403219?v=4?s=100" width="100px;" alt="Gunal"/><br /><sub><b>Gunal</b></sub></a><br /><a href="#content-gunal-123" title="Content">🖋</a></td>
1630+
</tr>
1631+
<tr>
1632+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/LadyDhaga"><img src="https://avatars.githubusercontent.com/u/106376368?v=4?s=100" width="100px;" alt="chinaman123"/><br /><sub><b>chinaman123</b></sub></a><br /><a href="#ideas-LadyDhaga" title="Ideas, Planning, & Feedback">🤔</a></td>
16281633
</tr>
16291634
</tbody>
16301635
</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": "7.19.0",
3+
"version": "7.19.1",
44
"description": "Website of ethereum.org",
55
"main": "index.js",
66
"repository": "git@github.com:ethereum/ethereum-org-website.git",

‎src/@chakra-ui/gatsby-plugin/components/Link.ts

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,22 @@ import { defineMergeStyles, linkDefaultTheme } from "./components.utils"
44
export const Link = defineStyleConfig({
55
baseStyle: defineMergeStyles(linkDefaultTheme.baseStyle, {
66
color: "primary.base",
7-
textDecoration: "underline",
8-
_focus: {
9-
boxShadow: "none",
10-
},
7+
textDecor: "underline",
8+
textUnderlineOffset: "3px",
119
_focusVisible: {
1210
boxShadow: "none",
13-
outline: "auto",
11+
outline: "2px solid",
12+
outlineColor: "primary.hover",
13+
outlineOffset: "2px",
14+
borderRadius: "sm",
15+
},
16+
_hover: {
17+
color: "primary.hover",
18+
},
19+
"&[data-inline-link]": {
20+
_visited: {
21+
color: "primary.visited",
22+
},
1423
},
1524
}),
1625
})

‎src/components/ActionCard.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
} from "@chakra-ui/react"
1414
import { GatsbyImage, IGatsbyImageData } from "gatsby-plugin-image"
1515

16-
import Link from "./Link"
16+
import { BaseLink } from "./Link"
1717

1818
const linkBoxFocusStyles: BoxProps = {
1919
borderRadius: "base",
@@ -111,7 +111,7 @@ const ActionCard: React.FC<IProps> = ({
111111
lineHeight={1.4}
112112
>
113113
<LinkOverlay
114-
as={Link}
114+
as={BaseLink}
115115
color="text"
116116
hideArrow
117117
textDecoration="none"

‎src/components/Avatar/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import {
66
CenterProps,
77
FlexProps,
88
forwardRef,
9-
Link,
109
LinkBox,
1110
LinkOverlay,
1211
LinkProps,
1312
ThemingProps,
1413
} from "@chakra-ui/react"
1514
import { RxExternalLink } from "react-icons/rx"
15+
import { BaseLink } from "../Link"
1616

1717
type AssignAvatarProps = Required<Pick<AvatarProps, "name" | "src">> &
1818
AvatarProps
@@ -44,7 +44,7 @@ const Avatar = forwardRef<AvatarLinkProps, "div" | "a">((props, ref) => {
4444
return (
4545
<LinkBox as={Center} ref={ref} flexDirection={_direction} columnGap="1">
4646
<LinkOverlay
47-
as={Link}
47+
as={BaseLink}
4848
data-peer
4949
display="inline-flex"
5050
textDecoration="none"
@@ -65,7 +65,7 @@ const Avatar = forwardRef<AvatarLinkProps, "div" | "a">((props, ref) => {
6565

6666
return (
6767
<ChakraAvatar
68-
as={Link}
68+
as={BaseLink}
6969
ref={ref}
7070
showBorder
7171
{...avatarProps}

‎src/components/Banners/TranslatathonBanner.tsx

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎src/components/BaseStories/Link.stories.tsx

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
import * as React from "react"
2+
import { Box, Center, ListItem, Text, UnorderedList } from "@chakra-ui/react"
3+
import { Meta, StoryObj } from "@storybook/react"
4+
import Link from "../Link"
5+
6+
type LinkType = typeof Link
7+
8+
const meta = {
9+
title: "Molecules / Navigation / Links",
10+
component: Link,
11+
decorators: [
12+
(Story) => (
13+
<Center maxW="prose">
14+
<Story />
15+
</Center>
16+
),
17+
],
18+
} satisfies Meta<LinkType>
19+
20+
export default meta
21+
22+
type Story = StoryObj<typeof meta>
23+
24+
const MockParagraph = ({ to }: { to?: string }) => (
25+
<Text>
26+
Text body normal. Ethereum is open access to digital money and data-friendly
27+
services for everyone – no matter your background or location. It's a{" "}
28+
<Link to={to}>community-built</Link> technology behind the cryptocurrency
29+
ether (ETH) and thousands of applications you can use today.
30+
</Text>
31+
)
32+
33+
export const InternalLink: Story = {
34+
args: {
35+
to: "#",
36+
},
37+
render: (args) => <MockParagraph {...args} />,
38+
}
39+
40+
export const ExternalLink: Story = {
41+
args: {
42+
to: "https://example.com",
43+
},
44+
render: (args) => <MockParagraph {...args} />,
45+
}
46+
47+
export const LinkList: Story = {
48+
render: () => (
49+
<Box>
50+
<Text>
51+
Text body normal. Ethereum is open access to digital money and
52+
data-friendly services for everyone – no matter your background or
53+
location. It's a community-built technology behind the cryptocurrency
54+
ether (ETH) and thousands of applications you can use today.
55+
</Text>
56+
<UnorderedList>
57+
{Array.from({ length: 9 }).map((_, idx) => (
58+
<ListItem key={idx + 1}>
59+
<Link
60+
to={idx % 2 === 0 ? "https://example.com" : "#"}
61+
>{`List Item ${idx % 2 === 0 ? "External" : "Internal"} ${
62+
idx + 1
63+
}`}</Link>
64+
</ListItem>
65+
))}
66+
</UnorderedList>
67+
</Box>
68+
),
69+
}

‎src/components/Breadcrumbs/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
BreadcrumbProps,
88
} from "@chakra-ui/react"
99

10-
import Link from "../Link"
10+
import { BaseLink } from "../Link"
1111

1212
export interface IProps extends BreadcrumbProps {
1313
slug: string
@@ -92,9 +92,10 @@ const Breadcrumbs: React.FC<IProps> = ({
9292
m={0}
9393
>
9494
<BreadcrumbLink
95-
as={Link}
95+
as={BaseLink}
9696
to={crumb.fullPath}
9797
isPartiallyActive={isCurrentPage}
98+
fontWeight="normal"
9899
_hover={{ color: "primary.base", textDecor: "none" }}
99100
_active={{ color: "primary.base" }}
100101
sx={{

‎src/components/BugBountyPoints.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import axios from "axios"
66

77
import Emoji from "./Emoji"
88
import Translation from "./Translation"
9-
import Link from "./Link"
9+
import InlineLink from "./Link"
1010
import Tooltip from "./Tooltip"
1111

1212
import { getImage } from "../utils/image"
@@ -87,7 +87,9 @@ const BugBountyPoints: React.FC<IProps> = () => {
8787
const tooltipContent = (
8888
<Box>
8989
<Translation id="data-provided-by" />{" "}
90-
<Link to="https://www.coingecko.com/en/api">coingecko.com</Link>
90+
<InlineLink to="https://www.coingecko.com/en/api">
91+
coingecko.com
92+
</InlineLink>
9193
</Box>
9294
)
9395

0 commit comments

Comments
 (0)