From 0f9490bf3e15b76c502685ad2f000819ce49390a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 14:40:39 -0800 Subject: [PATCH 01/13] Fixes #6352: marketing-alternate broken nav in FF17 --- marketing-alternate.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/marketing-alternate.html b/marketing-alternate.html index 8cbeb02a25..18135c9aae 100644 --- a/marketing-alternate.html +++ b/marketing-alternate.html @@ -57,6 +57,8 @@ } .navbar .nav { margin: 0; + display: table; + width: 100%; } .navbar .nav li { display: table-cell; From b7f2a382b610a677a8cf58c983fcd750c9aa7fd9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 20:27:07 -0800 Subject: [PATCH 02/13] Update new example name and links --- marketing-alternate.html => justified-nav.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename marketing-alternate.html => justified-nav.html (100%) diff --git a/marketing-alternate.html b/justified-nav.html similarity index 100% rename from marketing-alternate.html rename to justified-nav.html From 4fa4d5254d8b1fc9dae9ee1dfbe555323aaa4e2b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 21 Dec 2012 19:10:05 -0800 Subject: [PATCH 03/13] Fixes #6189: Add holder.js to carousel example --- carousel.html | 1 + 1 file changed, 1 insertion(+) diff --git a/carousel.html b/carousel.html index 0958103fc6..2a0cadec1a 100644 --- a/carousel.html +++ b/carousel.html @@ -448,5 +448,6 @@ }) }(window.jQuery) + From 7b4971e4d1022e0349dc01ea81756e801195fdf9 Mon Sep 17 00:00:00 2001 From: Justin John Mathews Date: Wed, 9 Jan 2013 15:53:17 +0530 Subject: [PATCH 04/13] Corrected carousel arrows to active.#6494, #6489 Corrected the carousel arrows to active on resizing the browser window. --- carousel.html | 1 + 1 file changed, 1 insertion(+) diff --git a/carousel.html b/carousel.html index 0958103fc6..77a82c0952 100644 --- a/carousel.html +++ b/carousel.html @@ -88,6 +88,7 @@ text-shadow: 0 1px 1px rgba(0,0,0,.4); background-color: transparent; border: 0; + z-index: 10; } .carousel .item { From ee9cd0180d25928f76bfd9b4457275df6a00a619 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 9 Jan 2013 19:53:42 -0800 Subject: [PATCH 05/13] add sticky footer with navbar --- sticky-footer-navbar.html | 166 ++++++++++++++++++++++++++++++++++++++ sticky-footer.html | 1 + 2 files changed, 167 insertions(+) create mode 100644 sticky-footer-navbar.html diff --git a/sticky-footer-navbar.html b/sticky-footer-navbar.html new file mode 100644 index 0000000000..17e216ee77 --- /dev/null +++ b/sticky-footer-navbar.html @@ -0,0 +1,166 @@ + + + + + Sticky footer · Twitter Bootstrap + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+ + + + + + Project name +
+ + +
+
+
+
+ + +
+
+

Sticky footer with fixed navbar

+
+

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 1c9c36149e..80490ffd0c 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.

From ebd17141e8f9ff9119341afaab4355910149fe46 Mon Sep 17 00:00:00 2001 From: William Franceschine Date: Thu, 10 Jan 2013 02:10:52 -0800 Subject: [PATCH 06/13] Update docs/examples/fluid.html Updated copyright to 2013 --- fluid.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fluid.html b/fluid.html index 4ca2920efd..f08661aecb 100644 --- a/fluid.html +++ b/fluid.html @@ -128,7 +128,7 @@
-

© Company 2012

+

© Company 2013

From 69cc97dd3447370831ee400fdebd0a5667e5a420 Mon Sep 17 00:00:00 2001 From: William Franceschine Date: Thu, 10 Jan 2013 02:13:26 -0800 Subject: [PATCH 07/13] Update docs/examples/carousel.html Updated copyright to 2013 --- carousel.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/carousel.html b/carousel.html index 0958103fc6..5e81459f34 100644 --- a/carousel.html +++ b/carousel.html @@ -417,7 +417,7 @@ From 82eeba11b134f79290dc23a38590e6ce936b25ca Mon Sep 17 00:00:00 2001 From: William Franceschine Date: Thu, 10 Jan 2013 02:13:43 -0800 Subject: [PATCH 08/13] Update docs/examples/hero.html Updated copyright to 2013 --- hero.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hero.html b/hero.html index f0a5e17093..6c585eac25 100644 --- a/hero.html +++ b/hero.html @@ -100,7 +100,7 @@
-

© Company 2012

+

© Company 2013

From d05006349ee3576d0f5a8ad4425d4c54b3f9f742 Mon Sep 17 00:00:00 2001 From: William Franceschine Date: Thu, 10 Jan 2013 02:13:57 -0800 Subject: [PATCH 09/13] Update docs/examples/marketing-alternate.html Updated copyright to 2013 --- marketing-alternate.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marketing-alternate.html b/marketing-alternate.html index 8cbeb02a25..8bebe30632 100644 --- a/marketing-alternate.html +++ b/marketing-alternate.html @@ -146,7 +146,7 @@
-

© Company 2012

+

© Company 2013

From e7a13a94168c9a83898ab1d549b8ced22b42774c Mon Sep 17 00:00:00 2001 From: William Franceschine Date: Thu, 10 Jan 2013 02:14:14 -0800 Subject: [PATCH 10/13] Update docs/examples/marketing-narrow.html Updated copyright to 2013 --- marketing-narrow.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marketing-narrow.html b/marketing-narrow.html index 9ce1cd5bc6..996f8a1da1 100644 --- a/marketing-narrow.html +++ b/marketing-narrow.html @@ -111,7 +111,7 @@
-

© Company 2012

+

© Company 2013

From 99649aad71e1046b4e066eb9cc7129987fbc6513 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 11:00:45 -0800 Subject: [PATCH 11/13] Remove navbar links from sticky footer navbar example --- sticky-footer-navbar.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sticky-footer-navbar.html b/sticky-footer-navbar.html index 17e216ee77..ad4f87a04f 100644 --- a/sticky-footer-navbar.html +++ b/sticky-footer-navbar.html @@ -115,11 +115,6 @@ - From 07a5563a0b27f09e73b148b6bd2dc123d5f05780 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 20:30:56 -0800 Subject: [PATCH 12/13] Comment fix --- carousel.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/carousel.html b/carousel.html index 30053e4bea..328fe5a1e1 100644 --- a/carousel.html +++ b/carousel.html @@ -68,7 +68,7 @@ - /* CUSTOMIZE THE NAVBAR + /* CUSTOMIZE THE CAROUSEL -------------------------------------------------- */ /* Carousel base class */ From d034ec74c41df536bc3bdfab8200dbf30031120f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jan 2013 00:20:13 -0800 Subject: [PATCH 13/13] fix username navbar text in fluid example for responsive variations --- fluid.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fluid.html b/fluid.html index f08661aecb..242050ab88 100644 --- a/fluid.html +++ b/fluid.html @@ -17,6 +17,15 @@ .sidebar-nav { padding: 9px 0; } + + @media (max-width: 980px) { + /* Enable use of floated navbar text */ + .navbar-text.pull-right { + float: none; + padding-left: 5px; + padding-right: 5px; + } + }