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

Improved hover state of search bar and fixed some warnings #17

Closed
wants to merge 5 commits into from

Conversation

A-4-Atom
Copy link

@A-4-Atom A-4-Atom commented Dec 29, 2023

Improved hover state of search bar
changed color of search button on hover for better visibility
Fixed some warnings like using class instead of className, not using key prop for lists, no alt attribute for image etc.

If you find any mistakes just let me know I will fix and commit the changes again.
see issue #4

Copy link
Contributor

@Nitya-Pasrija Nitya-Pasrija left a comment

Choose a reason for hiding this comment

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

Hey @A-4-Atom
There are some conflicts in this PR in the App.js file which may cause trouble. Kindly look into it.

@A-4-Atom
Copy link
Author

@Nitya-Pasrija
I've resolved the merge conflict

@i-am-SnehaChauhan
Copy link
Contributor

Hey @A-4-Atom, App.js and Recipe.js files have a merge conflict. Could you please sync your forked repository, make the necessary changes, and then submit your pull request. I can merge it once that's done.

@A-4-Atom
Copy link
Author

@i-am-SnehaChauhan I fixed it, there are no merge conflicts anymore.

Copy link
Contributor

@Nitya-Pasrija Nitya-Pasrija left a comment

Choose a reason for hiding this comment

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

image

The conflicts are still there, let's work this out. Try doing a git pull so that your code is in sync and we will merge the PR, once it's resolved

@A-4-Atom A-4-Atom requested a review from Nitya-Pasrija January 2, 2024 12:04
@A-4-Atom A-4-Atom closed this Jan 4, 2024
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.

3 participants