Skip to content

Commit e3dccf3

Browse files
authored
Merge pull request #107 from Andrew-Colman/fix-broken-navbar
Fix broken navbar
2 parents 156cfc6 + 03418eb commit e3dccf3

File tree

2 files changed

+27
-33
lines changed

2 files changed

+27
-33
lines changed

_includes/navigation.html

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,26 @@
1-
<nav class="navbar navbar-mruby" role="navigation">
2-
<div class="navbar-header">
3-
<a href="/"><img src="/images/mruby_header.png" alt="mruby" title="mruby"></a>
4-
</div>
1+
<nav class="navbar navbar-mruby navbar-expand-md navbar-header pt-0 justify-content-between" role="navigation">
2+
<a href="/"><img src="/images/mruby_header.png" alt="mruby" title="mruby"></a>
3+
<div>
4+
<ul class="nav navbar-nav">
5+
<li class="nav-item"> <a href="/downloads" class="nav-link">Downloads</a>
6+
</li>
7+
<li class="nav-item"> <a href="/docs" class="nav-link">Documentation</a>
8+
</li>
9+
<li class="nav-item"> <a href="/libraries" class="nav-link">Libraries</a>
10+
</li>
11+
<li class="nav-item"> <a href="/about" class="nav-link">About</a>
12+
</li>
13+
<li class="nav-item"> <a href="/team" class="nav-link">Team</a>
14+
</li>
15+
</ul>
16+
<!-- <form class="form-inline " role="search">
517
6-
<div>
7-
<ul class="nav navbar-nav">
8-
<li>
9-
<a href="/downloads">Downloads</a>
10-
</li>
11-
<li>
12-
<a href="/docs">Documentation</a>
13-
</li>
14-
<li>
15-
<a href="/libraries">Libraries</a>
16-
</li>
17-
<li>
18-
<a href="/about">About</a>
19-
</li>
20-
<li>
21-
<a href="/team">Team</a>
22-
</li>
23-
</ul>
18+
<div class="form-group">
19+
<input type="text" class="form-control">
2420
25-
<!--
26-
<form class="navbar-form navbar-left" role="search">
27-
<div class="form-group">
28-
<input type="text" class="form-control">
29-
</div> <button type="submit" class="btn btn-default">Submit</button>
30-
</form>
31-
-->
32-
</div>
21+
</div> <button type="submit" class="btn btn-secondary">Submit</button>
3322
34-
</nav>
23+
</form>
24+
-->
25+
</div>
26+
</nav>

css/main.css

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ a {
88

99
.navbar-header img {
1010
margin-left: 160px;
11+
top:0;
12+
position: absolute;
1113
}
1214

1315
.footer {
@@ -25,7 +27,7 @@ a {
2527
right: 0px;
2628
left: 0px;
2729
z-index: 100;
28-
height: 90px;
30+
height: unset;
2931
}
3032

3133
.navbar-mruby .navbar-brand {
@@ -48,7 +50,7 @@ a {
4850
}
4951

5052
.navbar-mruby .navbar-nav > li > a {
51-
padding: 17px 22px;
53+
padding: 15px 22px!important;
5254
color: #ce2812;
5355
}
5456
.navbar-mruby .navbar-nav > li > a:hover, .navbar-mruby .navbar-nav > li > a:focus {

0 commit comments

Comments
 (0)