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

adjust button color and fix bad merge #1616

Merged
merged 2 commits into from
Nov 5, 2024
Merged

Conversation

piyalbasu
Copy link
Contributor

Changing button colors to adhere to the pattern established in the Figma of using:

  • button variant "secondary" for the main CTA
  • button variant "tertiary" for the cancel/secondary CTA (for ex: "Got it" and "Cancel")
  • button variant "primary" for actions that will cause changes to your account

Some examples:

Screenshot 2024-11-05 at 12 29 53 PM Screenshot 2024-11-05 at 12 36 40 PM Screenshot 2024-11-05 at 12 36 11 PM Screenshot 2024-11-05 at 12 35 49 PM

@@ -183,25 +180,7 @@ export const Account = () => {
setLoading={setLoading}
/>
{/* <BlockaidAnnouncement /> */}
<View.Content
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this looks like it was a result of a bad merge. This button now appears in the ... dropdown on Account

Copy link
Contributor

Choose a reason for hiding this comment

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

ah yup that was my mistake, thanks!

@@ -44,7 +44,7 @@
stroke: var(--sds-clr-base-01);
width: 1rem;
height: 1rem;
stroke: var(--sds-clr-gray-11);
stroke: var(--sds-clr-gray-12);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixing the button color of the Send and ... buttons on Account

Copy link
Contributor

Choose a reason for hiding this comment

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

Screenshot 2024-11-05 at 10 45 41 AM

Hmm gray-11 loooks like this for me 🤔

@piyalbasu piyalbasu merged commit 1fef11d into release/5.25.0 Nov 5, 2024
3 checks passed
@piyalbasu piyalbasu deleted the adjust-button-color branch November 5, 2024 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants