aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-15 16:23:33 -0700
committerMark Otto <[email protected]>2013-08-15 16:23:33 -0700
commit6b5a19955989e9fa2649b2527663a0e709d8105e (patch)
treebb5a24ad1cfe0cb51903f5d1e968de9a49d906c1
parent0bc2a69fc9c6ab946d6155002818d44fff446470 (diff)
parenta24319eb44003d5464fd46928d3aab3b296ab81d (diff)
downloadbootstrap-6b5a19955989e9fa2649b2527663a0e709d8105e.tar.xz
bootstrap-6b5a19955989e9fa2649b2527663a0e709d8105e.zip
Merge pull request #42 from huyouare/navbar-paths
Paths to navbar, navbar-fixed-top and navbar-static-top fixed in the navbar.
-rw-r--r--navbar-fixed-top/index.html13
-rw-r--r--navbar-static-top/index.html8
-rw-r--r--navbar/index.html13
3 files changed, 22 insertions, 12 deletions
diff --git a/navbar-fixed-top/index.html b/navbar-fixed-top/index.html
index 952e341b4..5a0e596af 100644
--- a/navbar-fixed-top/index.html
+++ b/navbar-fixed-top/index.html
@@ -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>
@@ -66,5 +66,10 @@
</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>
diff --git a/navbar-static-top/index.html b/navbar-static-top/index.html
index c430b5c97..25e9dcec4 100644
--- a/navbar-static-top/index.html
+++ b/navbar-static-top/index.html
@@ -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>
diff --git a/navbar/index.html b/navbar/index.html
index bd369fd49..689a0e35c 100644
--- a/navbar/index.html
+++ b/navbar/index.html
@@ -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>
@@ -66,5 +66,10 @@
</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>