-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #34 from hurricanemark/Phase2-BaselineToSeriousWorks
Phase2 baseline to serious works
- Loading branch information
Showing
2 changed files
with
53 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,69 +1,31 @@ | ||
<!-- This code contains navigation for an HTML document and uses several classes from Bootstrap for styling. --> | ||
|
||
<nav class="navbar navbar-expand-md navbar-dark bg-dark"> | ||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarTogglerDemo03" aria-controls="navbarTogglerDemo03" aria-expanded="false" aria-label="Toggle navigation"> | ||
<span class="navbar-toggler-icon"></span> | ||
</button> | ||
<a class="navbar-brand" href="/">TechRolEmi</a> | ||
<div class="collapse navbar-collapse" id="navbarTogglerDemo03"> | ||
<ul class="navbar-nav mr-auto mt-2 mt-lg-0"> | ||
<li class="nav-item active"> | ||
<a class="nav-link" href="/weatherbit">Weather <span class="sr-only">(current)</span></a> | ||
</li> | ||
<li class="nav-item active"> | ||
<a class="nav-link" href="/about">About</a> | ||
</li> | ||
|
||
<li class="nav-item"> | ||
<a class="nav-link" href="#">Register</a> | ||
</li> | ||
<li class="nav-item"> | ||
<a class="nav-link" href="#">Login</a> | ||
</li> | ||
|
||
<!-- <li class="nav-item"> | ||
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a> | ||
</li> --> | ||
</ul> | ||
<form class="form-inline my-2 my-lg-0"> | ||
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search"> | ||
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button> | ||
</form> | ||
</div> | ||
</nav> | ||
|
||
<!-- <nav class="navbar navbar-expand-md navbar-dark bg-dark" style="overflow-x:auto;"> | ||
<div class="container-fluid"> | ||
<a class="navbar-brand" href="/">TechRolEmi</a> | ||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarTogglerDemo02" aria-controls="navbarTogglerDemo02" aria-expanded="false" aria-label="Toggle navigation"> | ||
<span class="navbar-toggler-icon"></span> | ||
</button> | ||
<div class="collapse navbar-collapse" id="navbarTogglerDemo02"> | ||
<div class="navbar-collapse collapse w-100 order-1 order-md-0 dual-collapse2"> | ||
<ul class="navbar-nav me-auto"> | ||
<li class="nav-item"> | ||
<a class="nav-link active" href="/weatherbit">Weather</a> | ||
</li> | ||
</ul> | ||
</div> | ||
<div class="navbar-collapse collapse w-100 order-3 dual-collapse2"> | ||
<ul class="navbar-nav ms-auto"> | ||
<li class="nav-item"> | ||
<a class="nav-link active" href="/about">About</a> | ||
</li> | ||
<li class="nav-item"> | ||
<a class="nav-link" href="#">Register</a> | ||
</li> | ||
<li class="nav-item"> | ||
<a class="nav-link" href="#">Login</a> | ||
</li> | ||
</ul> | ||
</div> | ||
</div> | ||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggler" | ||
aria-controls="navbarToggler" aria-expanded="false" aria-label="Toggle navigation"> | ||
<span class="navbar-toggler-icon"></span> | ||
</button> | ||
<a class="navbar-brand" href="/">TechRolEmi</a> | ||
<div class="collapse navbar-collapse" id="navbarToggler"> | ||
<ul class="navbar-nav mr-auto mt-2 mt-lg-0"> | ||
<li class="nav-item active"> | ||
<a class="nav-link" href="/weatherbit">Weather <span class="sr-only">(current)</span></a> | ||
</li> | ||
<li class="nav-item active"> | ||
<a class="nav-link" href="/about">About</a> | ||
</li> | ||
|
||
<li class="nav-item"> | ||
<a class="nav-link" href="#">Register</a> | ||
</li> | ||
<li class="nav-item"> | ||
<a class="nav-link" href="#">Login</a> | ||
</li> | ||
|
||
</ul> | ||
<form class="form-inline my-2 my-lg-0"> | ||
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search"> | ||
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button> | ||
</form> | ||
</div> | ||
</nav> --> | ||
</nav> |