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 v7.14.2 #10528

Merged
merged 33 commits into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
1dd98b5
refactor(theme): update colors and semantic token structure
TylerAPfledderer May 20, 2023
28d53cc
docs(chakra-migration-guide): update guide for nested semantic token …
TylerAPfledderer May 21, 2023
25999d8
fix(theme/colors): fix syntax
TylerAPfledderer May 21, 2023
0118c5c
style(Search): fix css variable name for search modal background
TylerAPfledderer May 23, 2023
ab83cc8
fix(QuizWidget): update color token values
TylerAPfledderer May 23, 2023
7c8d788
fix(semanticTokens): fix values for the complementary color "outline"…
TylerAPfledderer May 23, 2023
a654952
fix(Search): typo
TylerAPfledderer May 23, 2023
7556941
fix(Quiz): fix missing token updates
TylerAPfledderer May 25, 2023
cf03b50
migrated: pages/developers/learning-tools.tsx to Chakra UI
Seek4samurai May 29, 2023
5c3bb2c
refactor: template/docs.tsx to chakra
amit-ksh Jun 4, 2023
de21b31
heading font family
amit-ksh Jun 4, 2023
00a8484
page border style
amit-ksh Jun 6, 2023
c328cf3
mdx chakra list component
amit-ksh Jun 6, 2023
c54f01d
Merge remote-tracking branch 'origin/dev' into refactor/theme-nested-…
TylerAPfledderer Jun 7, 2023
6f5e7fa
Update consensus-bounty-hunters.csv
asanso Jun 9, 2023
77ba629
update H2 lineHeight
amit-ksh Jun 10, 2023
7875490
revert changed permissions on images
pettinarip Jun 12, 2023
0027d53
add missing color token updates
pettinarip Jun 12, 2023
278c431
Merge pull request #10431 from ethereum/asanso-patch-1
corwintines Jun 14, 2023
d5aa829
Update community-events.json
RostyslavBortman Jun 14, 2023
438204c
Update community-meetups.json
RostyslavBortman Jun 14, 2023
59e0178
Merge pull request #10460 from RostyslavBortman/patch-2
corwintines Jun 15, 2023
6640661
Merge pull request #10459 from RostyslavBortman/patch-1
corwintines Jun 15, 2023
56011e4
Merge pull request #10278 from TylerAPfledderer/refactor/theme-nested…
pettinarip Jun 15, 2023
c4d2538
Apply suggestions from code review
pettinarip Jun 16, 2023
d4a9fa3
Merge pull request #10375 from amit-ksh/migrate-template/docs.tsx-to-…
pettinarip Jun 19, 2023
fb592cd
Merge branch 'dev' into pr/Seek4samurai/10348
pettinarip Jun 19, 2023
2921289
apply fixes from code review
pettinarip Jun 19, 2023
751d314
Update src/pages/developers/learning-tools.tsx
pettinarip Jun 19, 2023
af354c3
Merge pull request #10348 from Seek4samurai/dev
pettinarip Jun 19, 2023
88ddd2f
v7.14.2
pettinarip Jun 20, 2023
9114111
Merge pull request #10514 from ethereum/v7-14-2
pettinarip Jun 20, 2023
23dcde7
Merge pull request #10515 from ethereum/dev
pettinarip Jun 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion docs/chakra-migration-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,11 @@ const Text = styled.p`
`

// now
<Text color="primary" bg="background" />
<Text color="primary.base" bg="background.base" />
```

> Note the dotted notation. In Chakra, the values are referred to as "semantic tokens" and the new theme applies a nested structure of like tokens for better organization. See [semanticTokens.ts](../src/%40chakra-ui/gatsby-plugin/semanticTokens.ts)

<aside>
💡 In the **next iteration** we will refactor all the colors with the correct color from the new Design System
</aside>
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": "7.14.1",
"version": "7.14.2",
"description": "Website of ethereum.org",
"main": "index.js",
"repository": "[email protected]:ethereum/ethereum-org-website.git",
Expand Down
28 changes: 14 additions & 14 deletions src/@chakra-ui/gatsby-plugin/components/Button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@ const commonOutline = defineStyle({
bg: "transparent",
borderColor: "text",
_hover: {
color: "primary",
bg: "background",
borderColor: "primary",
color: "primary.base",
bg: "background.base",
borderColor: "primary.base",
_disabled: {
...disabledStylesOutline,
},
},
_active: {
color: "primary",
bg: "primaryLight",
borderColor: "primary",
color: "primary.base",
bg: "primary.light",
borderColor: "primary.base",
},
_focus: {
color: "primary",
borderColor: "background",
color: "primary.base",
borderColor: "background.base",
_disabled: {
...disabledStylesOutline,
},
Expand All @@ -68,17 +68,17 @@ const commonOutline = defineStyle({
const variantSolid = defineStyle((props) =>
defineMergeStyles(defaultVariants?.solid(props), {
color: "buttonColor",
bg: "primary",
bg: "primary.base",
border: 0,
_hover: {
bg: "primary",
bg: "primary.base",
opacity: 0.8,
_disabled: {
...disabledStylesSolid,
},
},
_active: {
bg: "primaryHover",
bg: "primary.hover",
},
_disabled: {
...disabledStylesSolid,
Expand All @@ -92,8 +92,8 @@ const variantOutline = defineStyle((props) =>

const variantOutlineColor = defineStyle({
...commonOutline,
color: "primary",
borderColor: "primary",
color: "primary.base",
borderColor: "primary.base",
})

const variantIcon = defineStyle({
Expand All @@ -104,7 +104,7 @@ const variantIcon = defineStyle({
color: "inherit",
boxShadow: "none",
_hover: {
color: "primary",
color: "primary.base",
boxShadow: "none",
},
})
Expand Down
2 changes: 1 addition & 1 deletion src/@chakra-ui/gatsby-plugin/components/Checkbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const { definePartsStyle, defineMultiStyleConfig } =

const baseStyleControl = defineStyle((props) =>
defineMergeStyles(defaultBaseStyle?.(props).control, {
bg: "background",
bg: "background.base",
_checked: {
bg: "primary400",
_hover: {
Expand Down
2 changes: 1 addition & 1 deletion src/@chakra-ui/gatsby-plugin/components/Link.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { defineMergeStyles, linkDefaultTheme } from "./components.utils"

export const Link = defineStyleConfig({
baseStyle: defineMergeStyles(linkDefaultTheme.baseStyle, {
color: "primary",
color: "primary.base",
textDecoration: "underline",
_focus: {
boxShadow: "none",
Expand Down
4 changes: 2 additions & 2 deletions src/@chakra-ui/gatsby-plugin/components/Progress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ const { definePartsStyle } = createMultiStyleConfigHelpers(parts.keys)

const baseStyle = definePartsStyle(() => ({
track: {
bg: "primaryLight",
bg: "primary.light",
// `borderRadius` applies to both track and `filledTrack` (https://github.com/chakra-ui/chakra-ui/pull/2946)
borderRadius: "full",
},
filledTrack: {
bgColor: "primary",
bgColor: "primary.base",
},
}))

Expand Down
6 changes: 3 additions & 3 deletions src/@chakra-ui/gatsby-plugin/components/Tabs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ const variantPrimary = definePartsStyle({
tab: {
borderTopRadius: "0.3rem",
borderBottom: "1px solid",
borderBottomColor: "primary",
borderBottomColor: "primary.base",
px: 4,
py: "0.3rem",
_selected: {
color: "background",
bg: "primary",
color: "background.base",
bg: "primary.base",
},
},
tabpanels: {
Expand Down
Loading