From 43d130762be1b3124baafc5953e552934cb1dfd7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 14:40:39 -0800 Subject: Fixes #6352: marketing-alternate broken nav in FF17 --- docs/examples/marketing-alternate.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/examples') diff --git a/docs/examples/marketing-alternate.html b/docs/examples/marketing-alternate.html index 8cbeb02a2..18135c9aa 100644 --- a/docs/examples/marketing-alternate.html +++ b/docs/examples/marketing-alternate.html @@ -57,6 +57,8 @@ } .navbar .nav { margin: 0; + display: table; + width: 100%; } .navbar .nav li { display: table-cell; -- cgit v1.2.3 From c1e82732cf4c87e0e73458feaf3b7c76e1ea489e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 20:27:07 -0800 Subject: Update new example name and links --- docs/examples/justified-nav.html | 174 +++++++++++++++++++++++++++++++++ docs/examples/marketing-alternate.html | 174 --------------------------------- 2 files changed, 174 insertions(+), 174 deletions(-) create mode 100644 docs/examples/justified-nav.html delete mode 100644 docs/examples/marketing-alternate.html (limited to 'docs/examples') diff --git a/docs/examples/justified-nav.html b/docs/examples/justified-nav.html new file mode 100644 index 000000000..18135c9aa --- /dev/null +++ b/docs/examples/justified-nav.html @@ -0,0 +1,174 @@ + + + + + Template · Bootstrap + + + + + + + + + + + + + + + + + + + + + + +

+ + + + +

Marketing stuff!

Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

+ Get started today +

+ +

+ + +

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

View details »

Heading

View details »

Heading

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.

View details »

+ +

+ + + +

+ + + + + + + + + + + + + + + + + + + diff --git a/docs/examples/marketing-alternate.html b/docs/examples/marketing-alternate.html deleted file mode 100644 index 18135c9aa..000000000 --- a/docs/examples/marketing-alternate.html +++ /dev/null @@ -1,174 +0,0 @@ - - - - - Template · Bootstrap - - - - - - - - - - - - - - - - - - - - - - -

- - - - -

Marketing stuff!

Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

- Get started today -

- -

- - -

Heading

View details »

Heading

View details »

Heading

View details »

- -

- - - -

- - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From 7f7039321d9078ff7127b56aabe6be0e85716350 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 21 Dec 2012 19:10:05 -0800 Subject: Fixes #6189: Add holder.js to carousel example --- docs/examples/carousel.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 0958103fc..2a0cadec1 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -448,5 +448,6 @@ }) }(window.jQuery) + -- cgit v1.2.3 From 2c2a847e752b638023f1f61e3cecf1e7ad46b453 Mon Sep 17 00:00:00 2001 From: Justin John Mathews Date: Wed, 9 Jan 2013 15:53:17 +0530 Subject: Corrected carousel arrows to active.#6494, #6489 Corrected the carousel arrows to active on resizing the browser window. --- docs/examples/carousel.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 0958103fc..77a82c095 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/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 { -- cgit v1.2.3 From ccf4c2fbe3e4299c64e6a0d7446ba96100375502 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 9 Jan 2013 19:53:42 -0800 Subject: add sticky footer with navbar --- docs/examples/sticky-footer-navbar.html | 166 ++++++++++++++++++++++++++++++++ docs/examples/sticky-footer.html | 1 + 2 files changed, 167 insertions(+) create mode 100644 docs/examples/sticky-footer-navbar.html (limited to 'docs/examples') diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html new file mode 100644 index 000000000..17e216ee7 --- /dev/null +++ b/docs/examples/sticky-footer-navbar.html @@ -0,0 +1,166 @@ + + + + + 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/docs/examples/sticky-footer.html b/docs/examples/sticky-footer.html index 1c9c36149..80490ffd0 100644 --- a/docs/examples/sticky-footer.html +++ b/docs/examples/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.

-- cgit v1.2.3 From 5eff3cdd5d77f765bd9713fc6ebaa73b9cc93a6f Mon Sep 17 00:00:00 2001 From: William Franceschine Date: Thu, 10 Jan 2013 02:10:52 -0800 Subject: Update docs/examples/fluid.html Updated copyright to 2013 --- docs/examples/fluid.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples') diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index 4ca2920ef..f08661aec 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/fluid.html @@ -128,7 +128,7 @@

-- cgit v1.2.3 From 1eb6a1d8c8e75d2f8019fbc554026def10066890 Mon Sep 17 00:00:00 2001 From: William Franceschine Date: Thu, 10 Jan 2013 02:13:26 -0800 Subject: Update docs/examples/carousel.html Updated copyright to 2013 --- docs/examples/carousel.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 0958103fc..5e81459f3 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -417,7 +417,7 @@ -- cgit v1.2.3 From edfc0bf8b3961ab2af81468f48e4ee99ea532200 Mon Sep 17 00:00:00 2001 From: William Franceschine Date: Thu, 10 Jan 2013 02:13:43 -0800 Subject: Update docs/examples/hero.html Updated copyright to 2013 --- docs/examples/hero.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples') diff --git a/docs/examples/hero.html b/docs/examples/hero.html index f0a5e1709..6c585eac2 100644 --- a/docs/examples/hero.html +++ b/docs/examples/hero.html @@ -100,7 +100,7 @@

-- cgit v1.2.3 From 9fdc9887cfcb71f05f6197a75511e1594de4c471 Mon Sep 17 00:00:00 2001 From: William Franceschine Date: Thu, 10 Jan 2013 02:13:57 -0800 Subject: Update docs/examples/marketing-alternate.html Updated copyright to 2013 --- docs/examples/marketing-alternate.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples') diff --git a/docs/examples/marketing-alternate.html b/docs/examples/marketing-alternate.html index 8cbeb02a2..8bebe3063 100644 --- a/docs/examples/marketing-alternate.html +++ b/docs/examples/marketing-alternate.html @@ -146,7 +146,7 @@

-- cgit v1.2.3 From cf852c1f62e3b62dbc51d78d558dd6f5a373a840 Mon Sep 17 00:00:00 2001 From: William Franceschine Date: Thu, 10 Jan 2013 02:14:14 -0800 Subject: Update docs/examples/marketing-narrow.html Updated copyright to 2013 --- docs/examples/marketing-narrow.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples') diff --git a/docs/examples/marketing-narrow.html b/docs/examples/marketing-narrow.html index 9ce1cd5bc..996f8a1da 100644 --- a/docs/examples/marketing-narrow.html +++ b/docs/examples/marketing-narrow.html @@ -111,7 +111,7 @@

-- cgit v1.2.3 From 649d8c985e94f9cf0b8aae82e03995a3347946d6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 11:00:45 -0800 Subject: Remove navbar links from sticky footer navbar example --- docs/examples/sticky-footer-navbar.html | 5 ----- 1 file changed, 5 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html index 17e216ee7..ad4f87a04 100644 --- a/docs/examples/sticky-footer-navbar.html +++ b/docs/examples/sticky-footer-navbar.html @@ -115,11 +115,6 @@ -

-- cgit v1.2.3 From 53f9e25150c0dcd8f2285691b0e74a7bde553fbe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 20:30:56 -0800 Subject: Comment fix --- docs/examples/carousel.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 30053e4be..328fe5a1e 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -68,7 +68,7 @@ - /* CUSTOMIZE THE NAVBAR + /* CUSTOMIZE THE CAROUSEL -------------------------------------------------- */ /* Carousel base class */ -- cgit v1.2.3 From aaf80d410a24b280c141bdc267056b1dde089089 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jan 2013 00:20:13 -0800 Subject: fix username navbar text in fluid example for responsive variations --- docs/examples/fluid.html | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'docs/examples') diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index f08661aec..242050ab8 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/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; + } + } -- cgit v1.2.3

Project name

Marketing stuff!

Heading

Heading

Heading

Project name

Marketing stuff!

Heading

Heading

Heading

Sticky footer with fixed navbar

Sticky footer