Skip to content

Commit 6c3ec44

Browse files
Merge pull request #33 from hurricanemark/Phase2-BaselineToSeriousWorks
Fully responsive pages
2 parents e8835b6 + 5d4acdc commit 6c3ec44

File tree

2 files changed

+38
-13
lines changed

2 files changed

+38
-13
lines changed

views/partials/head.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<style>
99
body { padding-top:20px; }
1010
</style>
11+
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
1112

12-
<!-- <link rel="stylesheet" type="text/css" href="/css/style.css">
13-
<link href='https://fonts.googleapis.com/css?family=Open+Sans:300' rel='stylesheet' type='text/css'> -->
13+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>

views/partials/header.ejs

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,48 @@
11
<!-- This code contains navigation for an HTML document and uses several classes from Bootstrap for styling. -->
2-
<!-- <nav class="navbar navbar-expand-lg navbar-light bg-light" style="background-color: #e3f2fd;">
3-
<a class="navbar-brand" href="/">TechRolEmi</a>
4-
<ul class="navbar-nav mr-auto">
2+
3+
<nav class="navbar navbar-expand-md navbar-dark bg-dark">
4+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarTogglerDemo03" aria-controls="navbarTogglerDemo03" aria-expanded="false" aria-label="Toggle navigation">
5+
<span class="navbar-toggler-icon"></span>
6+
</button>
7+
<a class="navbar-brand" href="/">TechRolEmi</a>
8+
<div class="collapse navbar-collapse" id="navbarTogglerDemo03">
9+
<ul class="navbar-nav mr-auto mt-2 mt-lg-0">
10+
<li class="nav-item active">
11+
<a class="nav-link" href="/weatherbit">Weather <span class="sr-only">(current)</span></a>
12+
</li>
13+
<li class="nav-item active">
14+
<a class="nav-link" href="/about">About</a>
15+
</li>
16+
517
<li class="nav-item">
6-
<a class="nav-link" href="/">Home</a>
18+
<a class="nav-link" href="#">Register</a>
719
</li>
820
<li class="nav-item">
9-
<a class="nav-link" href="/about">About</a>
21+
<a class="nav-link" href="#">Login</a>
1022
</li>
23+
24+
<!-- <li class="nav-item">
25+
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
26+
</li> -->
1127
</ul>
12-
</nav> -->
28+
<form class="form-inline my-2 my-lg-0">
29+
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
30+
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
31+
</form>
32+
</div>
33+
</nav>
1334

14-
<nav class="navbar navbar-expand-md navbar-dark bg-dark">
35+
<!-- <nav class="navbar navbar-expand-md navbar-dark bg-dark" style="overflow-x:auto;">
36+
1537
<div class="container-fluid">
1638
<a class="navbar-brand" href="/">TechRolEmi</a>
39+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarTogglerDemo02" aria-controls="navbarTogglerDemo02" aria-expanded="false" aria-label="Toggle navigation">
40+
<span class="navbar-toggler-icon"></span>
41+
</button>
42+
43+
<div class="collapse navbar-collapse" id="navbarTogglerDemo02">
1744
<div class="navbar-collapse collapse w-100 order-1 order-md-0 dual-collapse2">
1845
<ul class="navbar-nav me-auto">
19-
<!-- <li class="nav-item active">
20-
<a class="nav-link" href="/">Home</a>
21-
</li> -->
2246
<li class="nav-item">
2347
<a class="nav-link active" href="/weatherbit">Weather</a>
2448
</li>
@@ -40,5 +64,6 @@
4064
</li>
4165
</ul>
4266
</div>
67+
</div>
4368
</div>
44-
</nav>
69+
</nav> -->

0 commit comments

Comments
 (0)