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

feat/migrate-stake-and-withdraw-page-to-tailwind #544

Merged
merged 21 commits into from
Jan 31, 2025

Conversation

chiscookeke11
Copy link
Contributor

No description provided.

@whateverfw whateverfw self-requested a review January 30, 2025 15:34
@djeck1432 djeck1432 linked an issue Jan 30, 2025 that may be closed by this pull request
@djeck1432 djeck1432 self-requested a review January 30, 2025 15:37
@djeck1432
Copy link
Owner

Screenshot 2025-01-30 at 16 38 08 @chiscookeke11 who is author of this PR?

@chiscookeke11
Copy link
Contributor Author

chiscookeke11 commented Jan 30, 2025 via email

Copy link
Collaborator

Choose a reason for hiding this comment

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

don't make changes to Button as originally mentioned in the issue

Copy link
Collaborator

Choose a reason for hiding this comment

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

don't make changes to Button as originally mentioned in the issue

Copy link
Collaborator

Choose a reason for hiding this comment

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

You didn't remove old css classes

frontend/src/components/vault/gas-fee/gasFee.css Outdated Show resolved Hide resolved
frontend/pnpm-lock.yaml Outdated Show resolved Hide resolved
frontend/src/pages/withdraw/Withdraw.jsx Outdated Show resolved Hide resolved
frontend/src/pages/withdraw/Withdraw.jsx Outdated Show resolved Hide resolved
frontend/src/pages/withdraw/Withdraw.jsx Outdated Show resolved Hide resolved
<div className="mt-1.5">
<p className="text-(--primary) text-center text-lg mt-3 !-mb-5">Stake Withdrawal</p>
<div className="border !border-[#36294e] p-5 rounded-lg mt-5">
<div className="flex items-center !justify-between bg-(--footer-divider-bg) border !border-[#36294e] py-10 px-5 rounded-lg w-[600px]">
Copy link
Collaborator

Choose a reason for hiding this comment

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

please do not use custom colors like that bg-(--footer-divider-bg) here and in all other components

<div className="mt-1.5">
<p className="text-(--primary) text-center text-lg mt-3 !-mb-5">Stake Withdrawal</p>
<div className="border !border-[#36294e] p-5 rounded-lg mt-5">
<div className="flex items-center !justify-between bg-(--footer-divider-bg) border !border-[#36294e] py-10 px-5 rounded-lg w-[600px]">
Copy link
Collaborator

Choose a reason for hiding this comment

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

avoid important (!) and direct colors in components, move it to theme and use correctly, check tailwind docs

@chiscookeke11
Copy link
Contributor Author

chiscookeke11 commented Jan 30, 2025 via email

@chiscookeke11
Copy link
Contributor Author

I've implemented all the latest changes. I have a problem with the metric card in the stake.jsx page.
The metric card does not take up the height unless I modify its CSS.

@chiscookeke11
Copy link
Contributor Author

Fixed the height problem in the metric card.

@chiscookeke11
Copy link
Contributor Author

Fixed the border radius problem; a different file was being imported

Copy link
Collaborator

@whateverfw whateverfw left a comment

Choose a reason for hiding this comment

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

@chiscookeke11 please resolve merge conflicts, apart from that everything is fine

@chiscookeke11
Copy link
Contributor Author

Conflicts Fixed

Copy link
Collaborator

@whateverfw whateverfw left a comment

Choose a reason for hiding this comment

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

lgtm

@chiscookeke11
Copy link
Contributor Author

chiscookeke11 commented Jan 31, 2025 via email

Copy link
Owner

@djeck1432 djeck1432 left a comment

Choose a reason for hiding this comment

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

Looks good to me

@djeck1432 djeck1432 merged commit acef4eb into djeck1432:main Jan 31, 2025
1 check passed
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.

[Frontend] Migrate Vault Stake and Withdraw pages to Tailwind
4 participants