Skip to content

Conversation

@lipsa199
Copy link

@lipsa199 lipsa199 commented Mar 21, 2021

hey @harikesh409 I added the navbar section and linked the index.html to home in the practicedsa.html page issue-214 .

@lipsa199 lipsa199 closed this Mar 21, 2021
@lipsa199 lipsa199 reopened this Mar 21, 2021
@lipsa199
Copy link
Author

@harikesh409 sir can you please review it .

<header class="fix">

<nav class="navbar navbar-expand-lg navbar-dark fixed-top nav-col">
<a class="navbar-brand" href="#"><img src="images/icon.png" alt="Algo Phantoms" width="50px"
Copy link
Collaborator

Choose a reason for hiding this comment

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

link this to index.html

@harikesh409 harikesh409 added enhancement New Feature GSSOC21 GSSoC'21 level3 New features, major bug fixes. UI/UX UI/UX labels Mar 23, 2021
@harikesh409 harikesh409 linked an issue Mar 23, 2021 that may be closed by this pull request
@lipsa199
Copy link
Author

@harikesh409 ok sir I am going to fix these as you said .

@lipsa199
Copy link
Author

@harikesh409 sir now is it in correct form ?

@harikesh409
Copy link
Collaborator

@lipsa199 resolve the merge conflicts.

@lipsa199
Copy link
Author

lipsa199 commented Apr 4, 2021

@lipsa199 resolve the merge conflicts.

Done sir @harikesh409

Copy link
Collaborator

@harikesh409 harikesh409 left a comment

Choose a reason for hiding this comment

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

Why are the bootstrap styles removed it just messed up the navbar.

practicedsa.html Outdated
</style>
<script>
window.onload = function () {
var preloader = document.getElementById("preloader")
Copy link
Collaborator

Choose a reason for hiding this comment

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

There is no element with id preloader so either add the element or remove this.

@harikesh409
Copy link
Collaborator

@lipsa199 resolve the merge conflicts.

Done sir @harikesh409

image

Check your self before asking for review.

@lipsa199
Copy link
Author

lipsa199 commented Apr 5, 2021

@lipsa199 resolve the merge conflicts.

Done sir @harikesh409

image

Check your self before asking for review.

@harikesh409 sorry sir , I am working on it .

@lipsa199
Copy link
Author

@harikesh409 sir i donot understand the conflict issue can you please help me with this?

@harikesh409
Copy link
Collaborator

harikesh409 commented Apr 24, 2021

@harikesh409 sir i donot understand the conflict issue can you please help me with this?

there are few changes missing in your local so it is causing conflicts, if you don't know how to sync a forked repo please refer this: 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

Labels

changes requested enhancement New Feature GSSOC21 GSSoC'21 level3 New features, major bug fixes. UI/UX UI/UX

Projects

None yet

Development

Successfully merging this pull request may close these issues.

adding navbar in practicedsa.html page

2 participants