aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-26 20:48:10 -0700
committerMark Otto <[email protected]>2013-07-26 20:48:10 -0700
commit2998929b39eb3a4d587c6237d98095f9f5b0df2f (patch)
tree5ccc190c7c0b2d20c4b3441404287f60de9147c4
parentc3e662641135b9fadeff589682e85eb4ace4bce6 (diff)
downloadbootstrap-2998929b39eb3a4d587c6237d98095f9f5b0df2f.tar.xz
bootstrap-2998929b39eb3a4d587c6237d98095f9f5b0df2f.zip
fix up carousel holder and navbar probs
-rw-r--r--carousel/carousel.css1
-rw-r--r--carousel/index.html11
-rw-r--r--index.html24
3 files changed, 23 insertions, 13 deletions
diff --git a/carousel/carousel.css b/carousel/carousel.css
index 3d997481e..49f8483a2 100644
--- a/carousel/carousel.css
+++ b/carousel/carousel.css
@@ -15,6 +15,7 @@ body {
/* Special class on .container surrounding .navbar, used for positioning it into place. */
.navbar-wrapper {
+ position: relative;
z-index: 10;
}
diff --git a/carousel/index.html b/carousel/index.html
index 4d2e5fd98..9111e3bf1 100644
--- a/carousel/index.html
+++ b/carousel/index.html
@@ -168,5 +168,14 @@
</footer>
</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="../dist/js/bootstrap.js"></script>
+ <script src="../assets/js/holder.js"></script>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/index.html b/index.html
index 3c5ddb9b6..ec2dd713b 100644
--- a/index.html
+++ b/index.html
@@ -45,21 +45,21 @@
<div class="row">
<div class="col-lg-4">
- <a class="thumbnail" href="starter-template/" target="_blank">
+ <a class="thumbnail" href="starter-template/index.html" target="_blank">
<img src="screenshots/starter.png" alt="">
</a>
<h3>Starter template</h3>
<p>A barebones HTML page with Bootstrap's CSS and JavaScript included.</p>
</div>
<div class="col-lg-4">
- <a class="thumbnail" href="grid/" target="_blank">
+ <a class="thumbnail" href="grid/index.html" target="_blank">
<img src="screenshots/grid.png" alt="">
</a>
<h3>Basic grid layouts</h3>
<p>Simple grid layouts to familiarize you with using the Bootstrap grid system.</p>
</div>
<div class="col-lg-4">
- <a class="thumbnail" href="jumbotron/" target="_blank">
+ <a class="thumbnail" href="jumbotron/index.html" target="_blank">
<img src="screenshots/marketing.png" alt="">
</a>
<h3>Basic marketing site</h3>
@@ -69,21 +69,21 @@
<div class="row">
<div class="col-lg-4">
- <a class="thumbnail" href="jumbotron-narrow/" target="_blank">
+ <a class="thumbnail" href="jumbotron-narrow/index.html" target="_blank">
<img src="screenshots/jumbotron-narrow.png" alt="">
</a>
<h3>Narrow marketing</h3>
<p>Slim, lightweight marketing template for small projects or teams.</p>
</div>
<div class="col-lg-4">
- <a class="thumbnail" href="justified-nav/" target="_blank">
+ <a class="thumbnail" href="justified-nav/index.html" target="_blank">
<img src="screenshots/justified-nav.png" alt="">
</a>
<h3>Justified nav</h3>
<p>Marketing page with equal-width navigation links in a modified navbar.</p>
</div>
<div class="col-lg-4">
- <a class="thumbnail" href="signin/" target="_blank">
+ <a class="thumbnail" href="signin/index.html" target="_blank">
<img src="screenshots/signin.png" alt="">
</a>
<h3>Sign in</h3>
@@ -93,21 +93,21 @@
<div class="row">
<div class="col-lg-4">
- <a class="thumbnail" href="sticky-footer/" target="_blank">
+ <a class="thumbnail" href="sticky-footer/index.html" target="_blank">
<img src="screenshots/sticky-footer.png" alt="">
</a>
<h3>Sticky footer</h3>
<p>Pin a fixed-height footer to the bottom of the user's viewport.</p>
</div>
<div class="col-lg-4">
- <a class="thumbnail" href="sticky-footer-navbar/" target="_blank">
+ <a class="thumbnail" href="sticky-footer-navbar/index.html" target="_blank">
<img src="screenshots/sticky-footer-navbar.png" alt="">
</a>
<h3>Sticky footer w/ navbar</h3>
<p>Add a fixed navbar to the default sticky footer template.</p>
</div>
<div class="col-lg-4">
- <a class="thumbnail" href="carousel/" target="_blank">
+ <a class="thumbnail" href="carousel/index.html" target="_blank">
<img src="screenshots/carousel.png" alt="">
</a>
<h3>Carousel jumbotron</h3>
@@ -117,21 +117,21 @@
<div class="row">
<div class="col-lg-4">
- <a class="thumbnail" href="navbar/" target="_blank">
+ <a class="thumbnail" href="navbar/index.html" target="_blank">
<img src="screenshots/navbar.png" alt="">
</a>
<h3>Navbar</h3>
<p>Basic template for showcasing how the navbar works.</p>
</div>
<div class="col-lg-4">
- <a class="thumbnail" href="navbar-static-top/" target="_blank">
+ <a class="thumbnail" href="navbar-static-top/index.html" target="_blank">
<img src="screenshots/navbar-static-top.png" alt="">
</a>
<h3>Static top navbar</h3>
<p>Basic template for showcasing the static navbar variation.</p>
</div>
<div class="col-lg-4">
- <a class="thumbnail" href="navbar-fixed-top/" target="_blank">
+ <a class="thumbnail" href="navbar-fixed-top/index.html" target="_blank">
<img src="screenshots/navbar-fixed-top.png" alt="">
</a>
<h3>Fixed top navbar</h3>