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

Migrate Trilemma Triangle to Shadcn #13975

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Migrate Trilemma Triangle to Shadcn #13975

merged 2 commits into from
Sep 27, 2024

Conversation

minimalsm
Copy link
Contributor

Description

  • Migrated Trilemma Triangle to Shadcn
  • Add default border color from DS

Note

@nloureiro I took some liberties with picking colors: the current production Trilemma Triangle still uses blue for lightmode and orange for darkmode. This PR now uses purple instead, let me know if you have any suggestions/tweaks you'd like and I'll update.

Related Issue

#13946

Copy link

netlify bot commented Sep 26, 2024

Deploy Preview for ethereumorg ready!

Name Link
🔨 Latest commit
🔍 Latest deploy log https://app.netlify.com/sites/ethereumorg/deploys/66f5928290b09605cfdceea2
😎 Deploy Preview https://deploy-preview-13975--ethereumorg.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@minimalsm minimalsm mentioned this pull request Sep 26, 2024
65 tasks
@pettinarip pettinarip added the needs design approval 🧑‍🎨 Approval from a designer is needed before merging label Sep 27, 2024
Copy link
Member

@pettinarip pettinarip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM @minimalsm, will wait for a designers review before merging.

Comment on lines +157 to +160
// TODO: Add all border color tokens to match DS
border: {
DEFAULT: "hsla(var(--border))",
},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious about this, @nloureiro do we have a default color for our borders?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was added for the homepage and we should use on other pages too
Screen Shot 2024-09-27 08 41 20 AM

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screen Shot 2024-09-27 08 42 18 AM

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh awesome, will add them in a separate PR.

@nloureiro
Copy link
Contributor

looks good to me!!

thank you @minimalsm :)

Screen Shot 2024-09-27 08 51 26 AM

Comment on lines +157 to +160
// TODO: Add all border color tokens to match DS
border: {
DEFAULT: "hsla(var(--border))",
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was added for the homepage and we should use on other pages too
Screen Shot 2024-09-27 08 41 20 AM

Comment on lines +157 to +160
// TODO: Add all border color tokens to match DS
border: {
DEFAULT: "hsla(var(--border))",
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screen Shot 2024-09-27 08 42 18 AM

@nloureiro nloureiro removed the needs design approval 🧑‍🎨 Approval from a designer is needed before merging label Sep 27, 2024
@pettinarip pettinarip merged commit ff97053 into dev Sep 27, 2024
4 of 10 checks passed
@pettinarip pettinarip deleted the migrateTrilemma branch September 27, 2024 13:03
This was referenced Oct 2, 2024
@pettinarip pettinarip added the hacktoberfest Track hacktoberfest activity label Oct 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hacktoberfest Track hacktoberfest activity
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants