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

86b1tvmtu #29

Open
wants to merge 11 commits into
base: development
Choose a base branch
from
Open

86b1tvmtu #29

wants to merge 11 commits into from

Conversation

s92068606
Copy link
Contributor

86b1tvmtu: i have created reset password UI design

@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
Copy link
Collaborator

Choose a reason for hiding this comment

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

Remove this. Use nextjs development server.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok done

"@radix-ui/react-slot": "^1.1.0",
"@shadcn/ui": "^0.0.4",
"antd": "^5.20.2",
"antd": "^5.20.3",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Ant design shouldn't be installed. Make sure you took a pull from development.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, pull from development

/* Custom styles for the layout */
Copy link
Collaborator

Choose a reason for hiding this comment

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

Remove all of these and use tailwindcss classes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok done

@s92068606
Copy link
Contributor Author

i made the changes, please review code

@s92068606 s92068606 requested a review from bsaranga September 1, 2024 07:20
@bsaranga
Copy link
Collaborator

bsaranga commented Sep 2, 2024

@s92068606 fix merge conflicts

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