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

Issue #55 #259

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

Issue #55 #259

wants to merge 2 commits into from

Conversation

debjani1413
Copy link

@debjani1413 debjani1413 commented Mar 26, 2021

Description

Adding an animated search-bar in the navigation area

Please include a summary of the change and which issue is fixed.
Fixes # (issue)
I have updated the index.html and the style.css files for adding an animated search bar in the navigation are. My code has proper commenting done for the reader to understand. This is issue #55 that has been fixed.

List any dependencies that are required for this change

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • [.] New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

The added feature has been tested by running the code with the modifications made in a local-server and it works fine.

UI /UX changes

Attach gif or screenshot for changes.

  • Before :
    before
- After :

ezgif com-gif-maker (3)

Checklist:

  • [. ] My code follows the style guidelines of this project
  • [ .] I have performed a self-review of my own code
  • [ .] I have commented my code, particularly in hard-to-understand areas
  • [ .] I have made corresponding changes to the documentation
  • [ .] My changes generate no new warnings
  • [ .] I have added tests that prove my fix is effective or that my feature works
  • [ .] New and existing unit tests pass locally with my changes

The custom style for an animated search bar in the nav has been added with proper comments.
@@ -89,6 +100,16 @@
<a class="dropdown-item" href="practicedsa.html">DSA Problems</a>

</div>
<!--Placing the search bar as a list item-->
<li class="searchbar">
<div class="searchbar">
Copy link
Collaborator

Choose a reason for hiding this comment

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

Use proper indentations.

@debjani1413
Copy link
Author

Hello, @harikesh409 the branches that have conflicts, should have those codes added there, else the search bar won't work. Can you please elaborate on how I should resolve the above conflict??

@debjani1413
Copy link
Author

hello, is there any update?? please help me to understand the issue being completely new, it is a little difficult, if you could help me I would really be grateful.

@harikesh409
Copy link
Collaborator

harikesh409 commented Apr 24, 2021

You need to sync your forked repo with the new changes then you can get the updated and code and can merge the conflicts.
Refer to this link for details steps: https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork

Sync a fork of a repository to keep it up-to-date with the upstream repository.

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

Successfully merging this pull request may close these issues.

2 participants