Skip to content

Commit

Permalink
Merge pull request #42 from huyouare/navbar-paths
Browse files Browse the repository at this point in the history 
Paths to navbar, navbar-fixed-top and navbar-static-top fixed in the navbar.
  • Loading branch information
@mdo
mdo committed Aug 15, 2013
2 parents 0bc2a69 + a24319e commit 6b5a199
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 12 deletions.
13 changes: 9 additions & 4 deletions navbar-fixed-top/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li class="nav-header">Nav header</li>
<li class="dropdown-header">Dropdown header</li>
<li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li>
</ul>
<ul class="nav navbar-nav pull-right">
<li><a href="/navbar/">Default</a></li>
<li><a href="/navbar-static-top/">Static top</a></li>
<li class="active"><a href="/navbar-fixed-top/">Fixed top</a></li>
<li><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li>
<li><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li>
<li class="active"><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
Expand All @@ -66,5 +66,10 @@ <h1>Navbar example</h1>

</div> <!-- /container -->

<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script>
<script src="../bootstrap/js/bootstrap.min.js"></script>
</body>
</html>
8 changes: 4 additions & 4 deletions navbar-static-top/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li class="nav-header">Nav header</li>
<li class="dropdown-header">Dropdown header</li>
<li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li>
</ul>
<ul class="nav navbar-nav pull-right">
<li><a href="/navbar/">Default</a></li>
<li class="active"><a href="/navbar-static-top/">Static top</a></li>
<li><a href="/navbar-fixed-top/">Fixed top</a></li>
<li><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li>
<li class="active"><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li>
<li><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
Expand Down
13 changes: 9 additions & 4 deletions navbar/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li class="nav-header">Nav header</li>
<li class="dropdown-header">Dropdown header</li>
<li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li>
</ul>
<ul class="nav navbar-nav pull-right">
<li class="active"><a href="/navbar/">Default</a></li>
<li><a href="/navbar-static-top/">Static top</a></li>
<li><a href="/navbar-fixed-top/">Fixed top</a></li>
<li class="active"><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li>
<li><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li>
<li><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
Expand All @@ -66,5 +66,10 @@ <h1>Navbar example</h1>

</div> <!-- /container -->

<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script>
<script src="../bootstrap/js/bootstrap.min.js"></script>
</body>
</html>

0 comments on commit 6b5a199

Please sign in to comment.