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.

Sign up for GitHub

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

Jump to bottom

fix: UI change to the side drawer #110

Merged
merged 10 commits into from Jan 7, 2022
Merged

fix: UI change to the side drawer #110

merged 10 commits into from Jan 7, 2022

Conversation

Rishab-ms
Copy link
Contributor

The UI of the side drawer has been improved to match the rest of the app
The Background Matches the color of the app now.
The Side Drawer doesn't take up the entire width of the screen like before
How it looks now:
(https://user-images.githubusercontent.com/55798225/145781702-d8ff325e-35d8-4296-898c-a236eff997b8.jpg)

Checklist:

Closes #108

@Sembauke
Copy link
Member

@Nirajn2311 what do you think?

We especially made the drawer look like the superblocks. But this does look better in my opinion.

@Sembauke
Copy link
Member

@Rishab-ms Can you add the banner logo instead of the puck logo, that would be great.

@Sembauke Sembauke changed the title UI Change to the side drawer fix: UI change to the side drawer Dec 13, 2021
@Rishab-ms
Copy link
Contributor Author

Will do. Anything else?

@Rishab-ms
Copy link
Contributor Author

@Sembauke How can I send a pull request for the changes you mentioned? should I create a new pull request?

@Rishab-ms
Copy link
Contributor Author

new_side_drawer
the drawer now looks like this

@Sembauke
Copy link
Member

Hey @Rishab-ms,

there are some extra files in your pr that were not supposed to be added.
Can you please remove them?

@Rishab-ms
Copy link
Contributor Author

Hey @Sembauke
The extra files are only due to fetching from upstream to keep my fork up to date

@Sembauke Sembauke added the status: waiting review Waiting for review label Dec 14, 2021
@Sembauke
Copy link
Member

Yes I am working towards fixing the issue sorry for the inconvenience

@Rishab-ms
Copy link
Contributor Author

Okay!

@Nirajn2311
Copy link
Member

Hi @Rishab-ms, could you delete the android and ios folder present in the root directory. These files are ignored files but recently we shifted to a monorepo format and so ignored files don't get shifted around, leaving them to appear as untracked files.

@Nirajn2311 Nirajn2311 added status: waiting update Applied to Issue/PR if a maintainer/reviewer has left a feedback and follow up is needed from OP and removed status: waiting review Waiting for review labels Dec 16, 2021
@Rishab-ms
Copy link
Contributor Author

okay, I Will delete the android and ios folder in the root directory

@Rishab-ms
Copy link
Contributor Author

done @Nirajn2311

@Nirajn2311 Nirajn2311 added status: waiting review Waiting for review status: merge conflict PRs waiting for merge conflicts to be resolved and removed status: waiting update Applied to Issue/PR if a maintainer/reviewer has left a feedback and follow up is needed from OP status: waiting review Waiting for review labels Dec 16, 2021
@Nirajn2311
Copy link
Member

@Rishab-ms There are some merge conflicts that need to be resolved. Could you resolve them?

@Nirajn2311 Nirajn2311 removed the status: waiting review Waiting for review label Dec 16, 2021
@Rishab-ms
Copy link
Contributor Author

Resolved @Nirajn2311

@Nirajn2311 Nirajn2311 added status: waiting review Waiting for review and removed status: merge conflict PRs waiting for merge conflicts to be resolved labels Dec 16, 2021
Sembauke
Sembauke requested changes Dec 17, 2021
View reviewed changes
Copy link
Member

@Sembauke Sembauke left a comment

Choose a reason for hiding this comment

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

Hey @Rishab-ms many of the buttons do not seem to work in the side drawer could you take a look?

@Sembauke Sembauke removed the status: waiting review Waiting for review label Dec 17, 2021
@Rishab-ms
Copy link
Contributor Author

Rishab-ms commented Dec 18, 2021 via email

@Sembauke Sembauke added the status: waiting update Applied to Issue/PR if a maintainer/reviewer has left a feedback and follow up is needed from OP label Dec 23, 2021
@Rishab-ms
Copy link
Contributor Author

@Sembauke
It's fixed now 😀

@Sembauke Sembauke mentioned this pull request Jan 3, 2022
Closed
2 tasks
@Nirajn2311 Nirajn2311 added status: waiting review Waiting for review and removed status: waiting update Applied to Issue/PR if a maintainer/reviewer has left a feedback and follow up is needed from OP labels Jan 5, 2022
@Rishab-ms
Copy link
Contributor Author

@Nirajn2311 @Sembauke

@Sembauke Sembauke merged commit 411e8b0 into freeCodeCamp:main Jan 7, 2022
@Sembauke
Copy link
Member

Sembauke commented Jan 7, 2022

Hi @Rishab-ms . Congrats on your first pull request (PR)! 🎉

Thank you for your contribution to the page! 👍
We are happy to accept these changes and look forward to future contributions. 📝

@Rishab-ms
Copy link
Contributor Author

Thank you so much ! So is there anything i should do to my fork before the next contribution? Like, should i delete the branch?

@Sembauke
Copy link
Member

Sembauke commented Jan 7, 2022

Hi @Rishab-ms,

Deleting your branch is entirely up to you :) It should be fine to delete it though.

If you are interested you can try to take up #125

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sembauke Sembauke Sembauke approved these changes

Assignees
No one assigned
Labels
status: waiting review Waiting for review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Side Drawer doesn't go well with the rest of the app.
3 participants
@Rishab-ms @Sembauke @Nirajn2311