Skip to content

Commit

Permalink
Merge pull request #326 from MadalapureVaishnavi/main
Browse files Browse the repository at this point in the history
made changes in navbar
  • Loading branch information
Durgesh-Vaigandla authored May 29, 2024
2 parents 5f62fa8 + 49d4a2a commit 2d7ee3e
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,22 @@

<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ms-auto mb-2 mb-lg-0 flex justify-content-center">
<li class="nav-item">
<li class="nav-item me-2">
<a class="nav-link" href="https://csedge.courses"><i class="fa-solid fa-house"></i> Home</a>
</li>
<li class="nav-item me-5 ">
<li class="nav-item me-2">
<a class="nav-link" href="https://csedge.courses/about"> <i class="fa-solid fa-circle-info"></i> About</a>
</li>
<li class="nav-item me-5 ">
<li class="nav-item me-2">
<<<<<<< HEAD
<a class="nav-link" href="https://csedge.courses#contact"
><i class="fa-solid fa-phone"></i> Contact</a
>
=======
<a class="nav-link" href="https://csedge.courses#contact"><i class="fa-solid fa-phone"></i> Contact</a>
>>>>>>> 434b8c3135ec0752902a6a57008fbeb98c33f471
</li>
<li class="nav-item ">
<li class="nav-item me-2">
<a class="nav-link active" aria-current="page" href="#!"><i class="fa-solid fa-blog"></i> Blog</a>
</li>
</ul>
Expand Down Expand Up @@ -279,8 +283,13 @@ <h2 class="card-title h4">
<nav aria-label="Pagination">
<hr class="my-0" />
<ul class="pagination justify-content-center my-4">
<<<<<<< HEAD
<li class="page-item">
<a class="page-link" href="#!" tabindex="-1" aria-disabled="true">Previous</a>
=======
<li class="page-item disabled">
<a class="page-link" href="#" tabindex="-1" aria-disabled="true">Previous</a>
>>>>>>> 434b8c3135ec0752902a6a57008fbeb98c33f471
</li>
<li class="page-item" aria-current="page">
<a class="page-link" href="#!">1</a>
Expand Down

1 comment on commit 2d7ee3e

@Ankur-Rai-19
Copy link
Contributor

Choose a reason for hiding this comment

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

@Durgesh-Vaigandla , @CSEdgeOff , please merge the changes after thoroughly reviewing the code because the navbar and the Next and Previous sections have been completely destroyed. I have raised issues for both of them, #331 & #332. Please assign them to me so that I can restore them to their previous state.

Please sign in to comment.