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

Fixed Toggle Option Visibility #126

Closed

Conversation

bhavesh1334
Copy link

Fixes #123

Description

Issue FIXES #
ISSUE #123

Describe the changes you've made

I have made changes on navbar.css file and style.js to fix sidebar visibility issue and have done minor adjustment .

Describe if there is any unusual behaviour of your code(Write NA if there isn't)

NA

Additional context (OPTIONAL)

Screenshot (82)

@vercel
Copy link

vercel bot commented Mar 23, 2021

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/feminine-devine/periodoo/5XK48JJLVw97Mo29rv4UW44izZ9T
✅ Preview: https://periodoo-git-fork-bhavesh1334-123-add-toggle-backg-faaa24.vercel.app

[Deployment for 4ab9c08 failed]

@ambivert-sam
Copy link
Contributor

hey ! @bhavesh1334 do have any idea why its showing "all checks have failed" the same thing happened with my PR also!!

@bhavesh1334
Copy link
Author

hey ! @bhavesh1334 do have any idea why its showing "all checks have failed" the same thing happened with my PR also!!
@ambivert-sam No idea what's the actual problem with it.

@bhavesh1334
Copy link
Author

hello! @khushishikhu, @Aaishpra Please review this pr , Why I am getting this issue all check failed, how this can be resolve.

@Aaishpra
Copy link
Member

Don't worry @bhavesh1334 @ambivert-sam it's vercel deployment which is failing nothing to do with the PR.
We will review it once we get some time @bhavesh1334

@bhavesh1334
Copy link
Author

Don't worry @bhavesh1334 @ambivert-sam it's vercel deployment which is failing nothing to do with the PR.
We will review it once we get some time @bhavesh1334

ok thanks..

@Aaishpra
Copy link
Member

Please remove the merge conflicts @bhavesh1334

@bhavesh1334
Copy link
Author

Please remove the merge conflicts @bhavesh1334

Not able to resolve , as this "resolve conflicts" button is not clickable from my side .

Screenshot (84)_LI

@bhavesh1334
Copy link
Author

Please remove the merge conflicts @bhavesh1334

Not able to resolve , as this "resolve conflicts" button is not clickable from my side .

Screenshot (84)_LI

Any alternative or should I send another pr for this issue .

@bhavesh1334
Copy link
Author

Please remove the merge conflicts @bhavesh1334

Not able to resolve , as this "resolve conflicts" button is not clickable from my side .

Screenshot (84)_LI

@Aaishpra Please suggest something to resolve this problem.

@Aaishpra
Copy link
Member

Aaishpra commented Mar 27, 2021

@bhavesh1334 i just checked this out, and this is because the merge conflicts on your PR are too big to be resolved on Github GUI(on the website)and can be solved only on your local machine (ie your laptop).
For solving this you can either do the following which is the preferred method

  1. Solve merge conflicts without creating additional merge commit (best way)
    git checkout your-branch
    git rebase upstream/master

  2. Create additional merge commit after solving conflicts
    git checkout your-branch
    git merge upstream/master

You can use these above methods to solve the conflicts if you're interested in learning something new🚀

Or if this is too overwhelming for you (which can be the case if you are a beginner on Github) you can serve your work in a new PR. I am totally cool with both options, whichever works for you use it 🙌🏻

References: https://github.community/t/resolve-conflict-button-is-disabled/123773

https://stackoverflow.com/questions/59110548/github-resolve-conflicts-button-disabled#:~:text=2%20Answers&text=If%20the%20Resolve%20conflicts%20button,for%20pull%20requests%20between%20repositories.

@khushishikhu khushishikhu added gssoc21 Issues for GirlSript Summer of Code Level2 Bug Fixing, Adding small features labels Apr 3, 2021
@khushishikhu
Copy link
Member

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
gssoc21 Issues for GirlSript Summer of Code Level2 Bug Fixing, Adding small features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Improve Toggle background
4 participants