Skip to content
This repository has been archived by the owner on Sep 20, 2021. It is now read-only.

Added navdrawer #207

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Added navdrawer #207

wants to merge 12 commits into from

Conversation

shuba400
Copy link
Contributor

171

Fixes #171

Short description of what this resolves:

Added navbar drawer and resolved the conflict from the previous case

Changes proposed in this pull request and/or Screenshots of changes:

@shuba400
Copy link
Contributor Author

shuba400 commented Jan 20, 2020

Sir I closed the previous PR as I was not able to resolve conflict an made this new one which can be easily merged
Here is a live link now
https://shuba400.github.io/Opencode-Collaborative-20/

@shuba400 shuba400 requested a review from thesmallstar January 20, 2020 12:56
@shuba400
Copy link
Contributor Author

Sir I have resolved the conflicts. Please tell if any other thing is neede to change and I will do it asap

@thesmallstar
Copy link
Member

Check the mobile view, fix it.

@shuba400
Copy link
Contributor Author

Update- Sir I have fixed the mobile view

@shuba400 shuba400 changed the title Add navdrawe Added navdrawer Jan 22, 2020
@shuba400
Copy link
Contributor Author

Sir I have made changes in the mobile vies of the site and also added the required buttons on the navdrawer.
If any other things are needed I will do it asap

@shuba400
Copy link
Contributor Author

Sir please merge this PR

@zerefwayne
Copy link
Contributor

@shuba400 Great work! Please squash the commits and the PR will be ready to merge.

@shuba400
Copy link
Contributor Author

Sir I am not able to understand squash from net.
Can you please share a link on squashing commits.

@NitinMadhukar
Copy link
Member

Sir I am not able to understand squash from net.
Can you please share a link on squashing commits.

https://github.com/wprig/wprig/wiki/How-to-squash-commits
and also resolve conflicts.

@shuba400
Copy link
Contributor Author

Sir I had conflict in the previous case, so what I did was that I closed that PR, deleted the repo and forked the new repo which was up to date and made the necessary changes and made a new PR.
It was ready to merge.
But now it is again showing conflicts. So is there a efficient way of doing this task

@shuba400
Copy link
Contributor Author

shuba400 commented Jan 26, 2020

Conflict has been fixed
But squashing is giving some problem
There are no commits showing in my machine for squashing where I need to change pick to squash
2020-01-26 (1)
@NitinMadhukar

@NitinMadhukar
Copy link
Member

@shuba400 resolve conflicts.

@shuba400
Copy link
Contributor Author

Update - Conflict Resolved

@NitinMadhukar
Copy link
Member

@shuba400 squash commits

@Jigar3
Copy link
Contributor

Jigar3 commented Feb 12, 2020

@shuba400 Resolve conflicts

@shuba400
Copy link
Contributor Author

Update - Conflict Resolved

@Jigar3
Copy link
Contributor

Jigar3 commented Feb 12, 2020

live-link?

@Jigar3
Copy link
Contributor

Jigar3 commented Feb 12, 2020

Remove the facebook and twitter links from navbar

@NitinMadhukar
Copy link
Member

@shuba400 resolve conflicts

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add a navigation drawer
5 participants