diff --git a/carousel.html b/carousel.html index 0958103fc..328fe5a1e 100644 --- a/carousel.html +++ b/carousel.html @@ -68,7 +68,7 @@ - /* CUSTOMIZE THE NAVBAR + /* CUSTOMIZE THE CAROUSEL -------------------------------------------------- */ /* Carousel base class */ @@ -88,6 +88,7 @@ text-shadow: 0 1px 1px rgba(0,0,0,.4); background-color: transparent; border: 0; + z-index: 10; } .carousel .item { @@ -417,7 +418,7 @@ @@ -448,5 +449,6 @@ }) }(window.jQuery) + diff --git a/hero.html b/hero.html index f0a5e1709..6c585eac2 100644 --- a/hero.html +++ b/hero.html @@ -100,7 +100,7 @@
diff --git a/marketing-alternate.html b/justified-nav.html similarity index 98% rename from marketing-alternate.html rename to justified-nav.html index 8cbeb02a2..9071a8d81 100644 --- a/marketing-alternate.html +++ b/justified-nav.html @@ -57,6 +57,8 @@ } .navbar .nav { margin: 0; + display: table; + width: 100%; } .navbar .nav li { display: table-cell; @@ -146,7 +148,7 @@
diff --git a/marketing-narrow.html b/marketing-narrow.html index 9ce1cd5bc..996f8a1da 100644 --- a/marketing-narrow.html +++ b/marketing-narrow.html @@ -111,7 +111,7 @@
diff --git a/sticky-footer-navbar.html b/sticky-footer-navbar.html new file mode 100644 index 000000000..ad4f87a04 --- /dev/null +++ b/sticky-footer-navbar.html @@ -0,0 +1,161 @@ + + + + + Sticky footer · Twitter Bootstrap + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ +

Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS. A fixed navbar has been added within #wrap with padding-top: 60px; on the .container.

+

Back to the sticky footer minus the navbar.

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + diff --git a/sticky-footer.html b/sticky-footer.html index 1c9c36149..80490ffd0 100644 --- a/sticky-footer.html +++ b/sticky-footer.html @@ -90,6 +90,7 @@

Sticky footer

Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS.

+

Use the sticky footer with a fixed navbar if need be, too.