Skip to content

B
bootstrap
Commit 6b5a1995 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge pull request #42 from huyouare/navbar-paths 

Paths to navbar, navbar-fixed-top and navbar-static-top fixed in the navbar.
parents 0bc2a69f a24319eb
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 12 deletions
navbar-fixed-top/index.html
View file @ 6b5a1995
...@@ -38,16 +38,16 @@ ...@@ -38,16 +38,16 @@
<li><a href="#">Another action</a></li> <li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li> <li><a href="#">Something else here</a></li>
<li class="divider"></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="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li> <li><a href="#">One more separated link</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav pull-right">
<li><a href="/navbar/">Default</a></li> <li><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li>
<li><a href="/navbar-static-top/">Static top</a></li> <li><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li>
<li class="active"><a href="/navbar-fixed-top/">Fixed top</a></li> <li class="active"><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li>
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
...@@ -66,5 +66,10 @@ ...@@ -66,5 +66,10 @@
</div> <!-- /container --> </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> </body>
</html> </html>
navbar-static-top/index.html
View file @ 6b5a1995
...@@ -38,16 +38,16 @@ ...@@ -38,16 +38,16 @@
<li><a href="#">Another action</a></li> <li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li> <li><a href="#">Something else here</a></li>
<li class="divider"></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="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li> <li><a href="#">One more separated link</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav pull-right">
<li><a href="/navbar/">Default</a></li> <li><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li>
<li class="active"><a href="/navbar-static-top/">Static top</a></li> <li class="active"><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li>
<li><a href="/navbar-fixed-top/">Fixed top</a></li> <li><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li>
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
......
navbar/index.html
View file @ 6b5a1995
...@@ -40,16 +40,16 @@ ...@@ -40,16 +40,16 @@
<li><a href="#">Another action</a></li> <li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li> <li><a href="#">Something else here</a></li>
<li class="divider"></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="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li> <li><a href="#">One more separated link</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav pull-right">
<li class="active"><a href="/navbar/">Default</a></li> <li class="active"><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li>
<li><a href="/navbar-static-top/">Static top</a></li> <li><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li>
<li><a href="/navbar-fixed-top/">Fixed top</a></li> <li><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li>
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
...@@ -66,5 +66,10 @@ ...@@ -66,5 +66,10 @@
</div> <!-- /container --> </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> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment