Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy v6.14.1 #8982

Merged
merged 86 commits into from
Dec 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
168c97c
refactor: Replace CardRow with native layout component
Nov 6, 2022
5fd8983
refactor: Inline button styles using style props
Nov 6, 2022
f76e1be
refactor: Replace CardRow with chakra components
Nov 7, 2022
5fea143
refactor: Pull shadows from theme for reusability
Nov 7, 2022
fcf8be5
Merge branch 'ethereum:dev' into refactor/migrate-bug-bounty-cards-to…
Marcelixoo Nov 7, 2022
2fd7265
add Nodereal to nodes-as-a-service page
wackerow Nov 8, 2022
bca5bdc
refactor: Implement Label using Chakra UI
Nov 9, 2022
fcaf360
refactor: Use new component within variations
Nov 9, 2022
d158309
refactor: Use variants to group label styles
Nov 9, 2022
078b197
Merge branch 'ethereum:dev' into refactor/migrate-bug-bounty-cards-to…
Marcelixoo Nov 9, 2022
86f3738
Update Polish (pl) Homepage, Essentials, and Exploring buckets
minimalsm Nov 17, 2022
304b797
Update Italian (it) Advanced developer docs bucket
minimalsm Nov 17, 2022
7c5f79c
Remove unwanted tutorial tags
minimalsm Nov 17, 2022
e6ab8b3
changed Cotainer and ContributorCard to chakra components
armgp Nov 19, 2022
b791671
changed Cotainer and ContributorCard to chakra components
armgp Nov 19, 2022
97bab9a
Merge branch 'ethereum:dev' into contributors
armgp Nov 21, 2022
43347cb
Contributors.tsx migrated to chakra.ui
armgp Nov 21, 2022
236be6c
Update Chinese Traditional (zh-tw) Homepage, Essentials, and Explorin…
minimalsm Nov 22, 2022
c3c5213
Remove Crowdin import
minimalsm Nov 22, 2022
120c475
Update Spanish (es) Use Ethereum bucket
minimalsm Nov 22, 2022
2dd4210
Update Portuguese Brazilian (pt-br) Learn pages and Upgrades buckets
minimalsm Nov 22, 2022
c1ab797
Merge branch 'ethereum:dev' into refactor/migrate-bug-bounty-cards-to…
Marcelixoo Nov 25, 2022
c31a9ab
refactor: Implement H2 element using Chakra UI components
Nov 25, 2022
c679f57
refactor: Implement description using Chakra UI components
Nov 25, 2022
1f9cd29
refactor: Replace custom divider with Chakra UI's Divider component
Nov 25, 2022
5b0379e
refactor: Implement SubHeader using Chakra UI componnets
Nov 25, 2022
28bde52
refactor: Implement Text using Chakra UI components
Nov 25, 2022
8fd75ab
refactor: Rename submission button for better readability
Nov 25, 2022
9715d9f
refactor: Replace specific labels with parametrized component
Nov 25, 2022
b1b2df7
refactor: Inline Chakra UI's Divider component
Nov 25, 2022
3dd60d4
refactor: Rename custom Text component for clarity
Nov 25, 2022
59a0962
refactor: Accept styled props in custom components
Nov 25, 2022
f02676a
chore: Remove debugging page
Nov 25, 2022
9757297
chore: Remove named export used for dev
Nov 25, 2022
fe9873e
refactor(breadcrumbs): implement Chakra's `Breadcrumb` component
TylerAPfledderer Dec 2, 2022
09f7233
chore(breadcrumbs): remove unused props
TylerAPfledderer Dec 2, 2022
610b265
refactor: stakingguides to chakra
ImMiguelP Dec 4, 2022
58f38c0
refactor: stakinghowsoloworks to chakra
ImMiguelP Dec 4, 2022
1f778ae
Update Chinese Simplified (zh) buckets
minimalsm Dec 5, 2022
c0d8b13
Update Dutch (nl) Use Cases and Staking buckets
minimalsm Dec 5, 2022
13261f4
Update Japanese (jp) Foundations and Techncial Stack developer docs
minimalsm Dec 5, 2022
169eb6a
Update Italian (it) 1-9 buckets
minimalsm Dec 5, 2022
23bb034
Update Italian (it) Foundations, Tech Stack, Whitepaper, Contributing…
minimalsm Dec 5, 2022
b6199ef
Update Portuguese Brazilian (pt-br) community and Foundations buckets
minimalsm Dec 5, 2022
2df636c
refactor: postmergebanner to chakra
ImMiguelP Dec 7, 2022
fa36f27
fix: stakinghowsoloworks flexdirection styling
ImMiguelP Dec 7, 2022
f543c12
fix: stlying using Center instead of Flex.
ImMiguelP Dec 7, 2022
da0edd9
fix: styling justify content removed not needed.
ImMiguelP Dec 8, 2022
54b8875
fix(breadcrumbs): append `/` to end of crumb fullPath
TylerAPfledderer Dec 15, 2022
e33d876
fix(breadcrumbs): revert original layout styles of `nav` element
TylerAPfledderer Dec 15, 2022
3329221
fix(table-of-contents-mobile): add wrapper component to show content …
TylerAPfledderer Dec 15, 2022
24e37e9
Merge pull request #8822 from ImMiguelP/chakra-stakinghowsoloworks
pettinarip Dec 15, 2022
33165ff
Merge pull request #8821 from ImMiguelP/chakra-stakingguides
pettinarip Dec 15, 2022
c974a73
Merge pull request #8810 from TylerAPfledderer/refactor/use-chakra-br…
pettinarip Dec 15, 2022
8d0f7e1
Merge pull request #8845 from ImMiguelP/chakra-postmergebanner
pettinarip Dec 16, 2022
4ce08fd
Use semantic tokens instead of hardcoded pixels
Marcelixoo Dec 16, 2022
bee7ec2
Use tokens from theme instead of CSS properties
Marcelixoo Dec 16, 2022
3d6110f
Merge branch 'ethereum:dev' into refactor/migrate-bug-bounty-cards-to…
Marcelixoo Dec 16, 2022
53b8efe
Use hook to get token from theme instead of CSS property
Dec 16, 2022
b17088f
Merge pull request #8928 from TylerAPfledderer/fix/toc-mobile-visibility
samajammin Dec 19, 2022
8a64cbc
Merge branch 'ethereum:dev' into contributors
armgp Dec 20, 2022
52aa8e6
review changes
armgp Dec 20, 2022
83ba9b0
add withdrawal faq item to staking page
wackerow Dec 21, 2022
9748885
Merge pull request #8624 from ethereum/novemberUpdatePolish
corwintines Dec 22, 2022
d3704c0
Merge pull request #8628 from ethereum/novemberUpdateItalianAdvancedDocs
corwintines Dec 22, 2022
d1e1210
Merge pull request #8706 from ethereum/novemberUpdateChineseTraditional
corwintines Dec 22, 2022
d1cc48c
add ethstaker knowledge base link
wackerow Dec 22, 2022
aef3d71
Merge pull request #8708 from ethereum/novemberUpdateSpanishUseEthereum
corwintines Dec 22, 2022
302d527
Merge pull request #8709 from ethereum/novemberUpdatePTBRBuckets
corwintines Dec 22, 2022
4ab9a3f
Merge pull request #8829 from ethereum/decemberUpdateChineseSimplified
corwintines Dec 22, 2022
55d0049
Merge pull request #8830 from ethereum/decememberUpdateDutch
corwintines Dec 22, 2022
b095405
Merge pull request #8831 from ethereum/decemberUpdateJapanese
corwintines Dec 22, 2022
b7ef078
Merge pull request #8832 from ethereum/decemberItalianBuckets
corwintines Dec 22, 2022
dbfc5d8
Merge pull request #8695 from armgp/contributors
pettinarip Dec 22, 2022
30c10b2
Merge pull request #8739 from Marcelixoo/refactor/migrate-bug-bounty-…
pettinarip Dec 22, 2022
8baa84b
docs: update README.md [skip ci]
allcontributors[bot] Dec 22, 2022
01e308e
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Dec 22, 2022
004018a
Merge pull request #8980 from ethereum/all-contributors/add-Marcelixoo
pettinarip Dec 22, 2022
b4600d9
Merge pull request #8833 from ethereum/decemberItalianDocs
corwintines Dec 22, 2022
5f0bf55
Merge pull request #8834 from ethereum/decemberBrazilianUpdates
corwintines Dec 22, 2022
4ef0d41
Merge pull request #8631 from ethereum/removeUnwantedTutorialTags
corwintines Dec 22, 2022
80a9bbc
Merge pull request #8536 from ethereum/nodereal
corwintines Dec 22, 2022
287936a
Merge pull request #8979 from ethereum/ethstaker-kb
corwintines Dec 22, 2022
0090626
Merge pull request #8961 from ethereum/withdrawal-faq
corwintines Dec 22, 2022
8585af8
v6.14.1
corwintines Dec 22, 2022
8e6470a
Merge pull request #8981 from ethereum/v6-14-1
corwintines Dec 22, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -9774,6 +9774,15 @@
"doc",
"translation"
]
},
{
"login": "Marcelixoo",
"name": "Marcelo T. dos Santos",
"avatar_url": "https://avatars.githubusercontent.com/u/29285152?v=4",
"profile": "http://marcelixoo.com",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1534,6 +1534,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="https://github.com/theSamPadilla"><img src="https://avatars.githubusercontent.com/u/35386211?v=4?s=100" width="100px;" alt="Sam Padilla"/><br /><sub><b>Sam Padilla</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=theSamPadilla" title="Documentation">📖</a></td>
<td align="center"><a href="https://chenquan.me"><img src="https://avatars.githubusercontent.com/u/20042193?v=4?s=100" width="100px;" alt="Chen Quan"/><br /><sub><b>Chen Quan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=terasum" title="Documentation">📖</a> <a href="#translation-terasum" title="Translation">🌍</a></td>
</tr>
<tr>
<td align="center"><a href="http://marcelixoo.com"><img src="https://avatars.githubusercontent.com/u/29285152?v=4?s=100" width="100px;" alt="Marcelo T. dos Santos"/><br /><sub><b>Marcelo T. dos Santos</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Marcelixoo" title="Code">💻</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.14.0",
"version": "6.14.1",
"description": "Website of ethereum.org",
"main": "index.js",
"repository": "[email protected]:ethereum/ethereum-org-website.git",
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 @@ -10,6 +10,7 @@ const shadows = {
"0 14px 66px rgba(0,0,0,.07), 0 10px 17px rgba(0,0,0,.03), 0 4px 7px rgba(0,0,0,.05)",
dark: "0 14px 66px hsla(0,0%,96.1%,.07), 0 10px 17px hsla(0,0%,96.1%,.03), 0 4px 7px hsla(0,0%,96.1%,.05)",
},
tableBoxHover: "0px 8px 17px rgba(0, 0, 0, 0.15)",
tableItemBox: {
light: "0 1px 1px rgba(0, 0, 0, 0.1)",
dark: "0 1px 1px hsla(0,0%,100%,.1)",
Expand Down
35 changes: 15 additions & 20 deletions src/components/Banners/PostMergeBanner.tsx
Original file line number Diff line number Diff line change
@@ -1,35 +1,30 @@
import React from "react"
import styled from "@emotion/styled"
import BannerNotification from "../BannerNotification"
import Translation from "../Translation"

import { TranslationKey } from "../../utils/translations"

const StyledBannerNotification = styled(BannerNotification)`
display: flex;
z-index: 1;
justify-content: center;
p {
max-width: 100ch;
margin: 0;
padding: 0;
}
a {
text-decoration: underline;
}
text-align: center;
`
import { Center, Text } from "@chakra-ui/react"

export interface IProps {
translationString: TranslationKey
}

const PostMergeBanner: React.FC<IProps> = ({ translationString }) => (
<StyledBannerNotification shouldShow={true}>
<p>
<Center
as={BannerNotification}
shouldShow={true}
zIndex={1}
textAlign="center"
sx={{
a: {
"text-decoration": "underline",
},
}}
>
<Text maxW="100ch" m={0} p={0}>
<Translation id={translationString} />
</p>
</StyledBannerNotification>
</Text>
</Center>
)

export default PostMergeBanner
71 changes: 36 additions & 35 deletions src/components/Breadcrumbs.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import React from "react"
import { Box, UnorderedList, ListItem } from "@chakra-ui/react"
import {
Breadcrumb,
BreadcrumbItem,
BreadcrumbLink,
BreadcrumbProps,
} from "@chakra-ui/react"
import { useIntl } from "react-intl"

import Link from "./Link"
import { isLang, supportedLanguages } from "../utils/languages"
import { isLang } from "../utils/languages"
import { isTranslationKey, translateMessageId } from "../utils/translations"

export interface IProps {
export interface IProps extends BreadcrumbProps {
slug: string
startDepth?: number
}
Expand Down Expand Up @@ -49,50 +54,46 @@ const Breadcrumbs: React.FC<IProps> = ({
})

return (
<Box
aria-label="Breadcrumb"
<Breadcrumb
dir="auto"
{...restProps}
as="nav"
marginBottom={8}
listStyleType="none"
position="relative"
zIndex={1}
zIndex="1"
mb={8}
sx={{
// TODO: Move this to `listProps` upon upgrading `@chakra-ui/react`
// to at least v2.4.2
ol: {
m: 0,
lineHeight: 1,
},
}}
{...restProps}
>
<UnorderedList
display="flex"
flexWrap="wrap"
listStyleType="none"
margin={0}
>
{crumbs.map((crumb, idx) => (
<ListItem
{crumbs.map((crumb, idx) => {
const isCurrentPage = slug === crumb.fullPath
return (
<BreadcrumbItem
key={idx}
margin={0}
marginRight={2}
isCurrentPage={isCurrentPage}
color="textTableOfContents"
fontSize="sm"
lineHeight="140%"
letterSpacing="wider"
lineHeight="140%"
m={0}
>
<Link
<BreadcrumbLink
as={Link}
to={crumb.fullPath}
isPartiallyActive={slug === crumb.fullPath}
textDecoration="none"
color="textTableOfContents"
isPartiallyActive={isCurrentPage}
_hover={{ color: "primary", textDecor: "none" }}
_active={{ color: "primary" }}
>
{crumb.text}
</Link>
{idx < crumbs.length - 1 && (
<Box as="span" marginLeft={2} color="textTableOfContents">
/
</Box>
)}
</ListItem>
))}
</UnorderedList>
</Box>
</BreadcrumbLink>
</BreadcrumbItem>
)
})}
</Breadcrumb>
)
}

Expand Down
Loading