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

Added navdrawer - #207

Open
shuba400 wants to merge 12 commits into
opencodeiiita:masterfrom
shuba400:master
Open

Added navdrawer#207
shuba400 wants to merge 12 commits into
opencodeiiita:masterfrom
shuba400:master

Conversation

@shuba400

@shuba400shuba400 commented Jan 20, 2020

Copy link
Copy Markdown
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

shuba400 commented Jan 20, 2020•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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 commented Jan 21, 2020

Copy link
Copy Markdown
ContributorAuthor

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

@thesmallstar

thesmallstar commented Jan 21, 2020

Copy link
Copy Markdown
Member

Check the mobile view, fix it.

@shuba400

shuba400 commented Jan 21, 2020

Copy link
Copy Markdown
ContributorAuthor

Update- Sir I have fixed the mobile view

@shuba400shuba400 changed the title Add navdraweAdded navdrawerJan 22, 2020
@shuba400

shuba400 commented Jan 22, 2020

Copy link
Copy Markdown
ContributorAuthor

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

shuba400 commented Jan 23, 2020

Copy link
Copy Markdown
ContributorAuthor

Sir please merge this PR

@zerefwayne

zerefwayne commented Jan 23, 2020

Copy link
Copy Markdown
Contributor

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

@zerefwayne
zerefwayne self-requested a review January 23, 2020 21:05
@NitinMadhukar
NitinMadhukar self-requested a review January 24, 2020 18:24
@shuba400

shuba400 commented Jan 25, 2020

Copy link
Copy Markdown
ContributorAuthor

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

@NitinMadhukar

NitinMadhukar commented Jan 25, 2020

Copy link
Copy Markdown
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

shuba400 commented Jan 25, 2020

Copy link
Copy Markdown
ContributorAuthor

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

shuba400 commented Jan 26, 2020•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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

NitinMadhukar commented Jan 29, 2020

Copy link
Copy Markdown
Member

@shuba400 resolve conflicts.

@shuba400

shuba400 commented Jan 30, 2020

Copy link
Copy Markdown
ContributorAuthor

Update - Conflict Resolved

@NitinMadhukar

NitinMadhukar commented Jan 30, 2020

Copy link
Copy Markdown
Member

@shuba400 squash commits

@Jigar3

Jigar3 commented Feb 12, 2020

Copy link
Copy Markdown
Contributor

@shuba400 Resolve conflicts

@shuba400

shuba400 commented Feb 12, 2020

Copy link
Copy Markdown
ContributorAuthor

Update - Conflict Resolved

@Jigar3

Jigar3 commented Feb 12, 2020

Copy link
Copy Markdown
Contributor

live-link?

@Jigar3

Jigar3 commented Feb 12, 2020

Copy link
Copy Markdown
Contributor

Remove the facebook and twitter links from navbar

@NitinMadhukar

NitinMadhukar commented Feb 13, 2020

Copy link
Copy Markdown
Member

@shuba400 resolve conflicts

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@thesmallstarthesmallstarAwaiting requested review from thesmallstar
@zerefwaynezerefwayneAwaiting requested review from zerefwayne
@NitinMadhukarNitinMadhukarAwaiting requested review from NitinMadhukar

Assignees

No one assigned

Labels

squashwork in progress

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Add a navigation drawer

5 participants

@shuba400@thesmallstar@zerefwayne@NitinMadhukar@Jigar3