From a9268c01c9f342d13e687e7a1897b55c525d0076 Mon Sep 17 00:00:00 2001 From: saiwang Date: Fri, 16 Aug 2013 13:42:43 +0800 Subject: fix links in examples --- examples/navbar-fixed-top/index.html | 8 ++++---- examples/navbar-static-top/index.html | 8 ++++---- examples/navbar/index.html | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'examples') diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html index 9bc75b5f2..3943ad247 100644 --- a/examples/navbar-fixed-top/index.html +++ b/examples/navbar-fixed-top/index.html @@ -47,9 +47,9 @@ @@ -62,7 +62,7 @@

Navbar example

This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.

- View navbar docs » + View navbar docs »

diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html index 1a49c8229..1b034f4c3 100644 --- a/examples/navbar-static-top/index.html +++ b/examples/navbar-static-top/index.html @@ -47,9 +47,9 @@ @@ -63,7 +63,7 @@

Navbar example

This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.

- View navbar docs » + View navbar docs »

diff --git a/examples/navbar/index.html b/examples/navbar/index.html index e89c83113..ab626126c 100644 --- a/examples/navbar/index.html +++ b/examples/navbar/index.html @@ -49,9 +49,9 @@ @@ -62,7 +62,7 @@

Navbar example

This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.

- View navbar docs » + View navbar docs »

-- cgit v1.2.3 From 29fe7ed68402aee6c24949ed2509a415d179bb57 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 10:58:28 -0700 Subject: fix up justified nav example --- examples/justified-nav/index.html | 8 ++++---- examples/justified-nav/justified-nav.css | 15 ++++++++------- examples/screenshots/justified-nav.jpg | Bin 0 -> 141141 bytes 3 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 examples/screenshots/justified-nav.jpg (limited to 'examples') diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html index de9ce387e..21a97b708 100644 --- a/examples/justified-nav/index.html +++ b/examples/justified-nav/index.html @@ -21,7 +21,7 @@

Project name

-
    +
    • Home
    • Projects
    • Services
      • @@ -46,17 +46,17 @@

      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 »

      +

      View details »

      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 »

      +

      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 »

      +

      View details »

diff --git a/examples/justified-nav/justified-nav.css b/examples/justified-nav/justified-nav.css index 89822eca2..cabd36d16 100644 --- a/examples/justified-nav/justified-nav.css +++ b/examples/justified-nav/justified-nav.css @@ -4,17 +4,16 @@ body { /* Everything but the jumbotron gets side spacing for mobile-first views */ .masthead, -.body-content, .footer { padding-left: 15px; padding-right: 15px; } .footer { - border-top: 1px solid #ddd; - margin-top: 30px; - padding-top: 29px; - padding-bottom: 30px; + border-top: 1px solid #eee; + margin-top: 40px; + padding-top: 40px; + padding-bottom: 40px; } /* Main marketing message and sign up button */ @@ -29,7 +28,7 @@ body { /* Customize the nav-justified links to be fill the entire space of the .navbar */ .nav-justified { - max-height: 50px; + max-height: 52px; background-color: #eee; border-radius: 5px; border: 1px solid #ccc; @@ -52,7 +51,9 @@ body { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */ background-image: linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* W3C */ } -.nav-justified > .active > a { +.nav-justified > .active > a, +.nav-justified > .active > a:hover, +.nav-justified > .active > a:focus { background-color: #ddd; background-image: none; box-shadow: inset 0 3px 7px rgba(0,0,0,.15); diff --git a/examples/screenshots/justified-nav.jpg b/examples/screenshots/justified-nav.jpg new file mode 100644 index 000000000..01689c3ca Binary files /dev/null and b/examples/screenshots/justified-nav.jpg differ -- cgit v1.2.3 From 1974aa6967184720d143cc510fe900f863cce63f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 11:03:52 -0700 Subject: fix up sticky footer example (fixes #9680) and add favicons to all examples --- examples/carousel/index.html | 1 + examples/grid/index.html | 1 + examples/jumbotron-narrow/index.html | 1 + examples/jumbotron/index.html | 1 + examples/justified-nav/index.html | 1 + examples/navbar-fixed-top/index.html | 1 + examples/navbar-static-top/index.html | 1 + examples/offcanvas/index.html | 1 + examples/signin/index.html | 1 + examples/starter-template/index.html | 1 + examples/sticky-footer-navbar/index.html | 1 + examples/sticky-footer-navbar/sticky-footer-navbar.css | 16 +++++----------- examples/sticky-footer/index.html | 1 + 13 files changed, 17 insertions(+), 11 deletions(-) (limited to 'examples') diff --git a/examples/carousel/index.html b/examples/carousel/index.html index 8f3ac988a..6e5edbbec 100644 --- a/examples/carousel/index.html +++ b/examples/carousel/index.html @@ -5,6 +5,7 @@ + Carousel Template for Bootstrap diff --git a/examples/grid/index.html b/examples/grid/index.html index 4525f7e49..3db13f58c 100644 --- a/examples/grid/index.html +++ b/examples/grid/index.html @@ -5,6 +5,7 @@ + Grid Template for Bootstrap diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html index 1d09fa852..9c3c1b6cf 100644 --- a/examples/jumbotron-narrow/index.html +++ b/examples/jumbotron-narrow/index.html @@ -5,6 +5,7 @@ + Narrow Jumbotron Template for Bootstrap diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html index b5a5a11ec..d5654e72e 100644 --- a/examples/jumbotron/index.html +++ b/examples/jumbotron/index.html @@ -5,6 +5,7 @@ + Jumbotron Template for Bootstrap diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html index 21a97b708..f01005f3f 100644 --- a/examples/justified-nav/index.html +++ b/examples/justified-nav/index.html @@ -5,6 +5,7 @@ + Justified Nav Template for Bootstrap diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html index 3943ad247..df6346217 100644 --- a/examples/navbar-fixed-top/index.html +++ b/examples/navbar-fixed-top/index.html @@ -5,6 +5,7 @@ + Fixed Top Navbar Example for Bootstrap diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html index 1b034f4c3..4ca88f02b 100644 --- a/examples/navbar-static-top/index.html +++ b/examples/navbar-static-top/index.html @@ -5,6 +5,7 @@ + Static Top Navbar Example for Bootstrap diff --git a/examples/offcanvas/index.html b/examples/offcanvas/index.html index e6c186462..fcfe48fa8 100644 --- a/examples/offcanvas/index.html +++ b/examples/offcanvas/index.html @@ -5,6 +5,7 @@ + Off Canvas Template for Bootstrap diff --git a/examples/signin/index.html b/examples/signin/index.html index 9521fb437..544e8fec3 100644 --- a/examples/signin/index.html +++ b/examples/signin/index.html @@ -5,6 +5,7 @@ + Signin Template for Bootstrap diff --git a/examples/starter-template/index.html b/examples/starter-template/index.html index 008125d14..d48a9dff0 100644 --- a/examples/starter-template/index.html +++ b/examples/starter-template/index.html @@ -5,6 +5,7 @@ + Starter Template for Bootstrap diff --git a/examples/sticky-footer-navbar/index.html b/examples/sticky-footer-navbar/index.html index a5182eeaf..3fab506b7 100644 --- a/examples/sticky-footer-navbar/index.html +++ b/examples/sticky-footer-navbar/index.html @@ -5,6 +5,7 @@ + Sticky Footer Navbar Template for Bootstrap diff --git a/examples/sticky-footer-navbar/sticky-footer-navbar.css b/examples/sticky-footer-navbar/sticky-footer-navbar.css index f12d7f386..6978a9997 100644 --- a/examples/sticky-footer-navbar/sticky-footer-navbar.css +++ b/examples/sticky-footer-navbar/sticky-footer-navbar.css @@ -24,17 +24,6 @@ body { background-color: #f5f5f5; } -/* Lastly, apply responsive CSS fixes as necessary */ -@media (max-width: 767px) { - #footer { - margin-left: -20px; - margin-right: -20px; - padding-left: 20px; - padding-right: 20px; - } -} - - /* Custom page CSS -------------------------------------------------- */ @@ -47,6 +36,11 @@ body { margin: 20px 0; } +#footer > .container { + padding-left: 15px; + padding-right: 15px; +} + code { font-size: 80%; } \ No newline at end of file diff --git a/examples/sticky-footer/index.html b/examples/sticky-footer/index.html index 8505d7637..6a5a2062d 100644 --- a/examples/sticky-footer/index.html +++ b/examples/sticky-footer/index.html @@ -5,6 +5,7 @@ + Sticky Footer Template for Bootstrap -- cgit v1.2.3 From 6965c12e3002dce219ae063342218f197b1a0bfc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 11:10:35 -0700 Subject: fixes #9697 --- examples/jumbotron/index.html | 8 ++++++-- examples/jumbotron/jumbotron.css | 6 ------ 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'examples') diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html index d5654e72e..fd874a804 100644 --- a/examples/jumbotron/index.html +++ b/examples/jumbotron/index.html @@ -47,8 +47,12 @@
- - +
+ +
+
+ +
diff --git a/examples/jumbotron/jumbotron.css b/examples/jumbotron/jumbotron.css index 17d253be4..594e2c794 100644 --- a/examples/jumbotron/jumbotron.css +++ b/examples/jumbotron/jumbotron.css @@ -4,12 +4,6 @@ body { padding-bottom: 20px; } -/* Set widths on the navbar form inputs since otherwise they're 100% wide */ -.navbar-form input[type="text"], -.navbar-form input[type="password"] { - width: 180px; -} - /* Wrapping element */ /* Set some basic padding to keep content from hitting the edges */ .body-content { -- cgit v1.2.3 From 4d36992180876fd233b079d4b8cad7fe65d2ec53 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 11:35:19 -0700 Subject: Fixed up examples more * sticky footer side scrolling * static and fixed navbar more similar * min-height on static and fixed navbar examples to illustrate differences last two items fix #9702 --- examples/navbar-fixed-top/index.html | 3 ++- examples/navbar-fixed-top/navbar-fixed-top.css | 7 ++----- examples/navbar-static-top/index.html | 3 ++- examples/navbar-static-top/navbar-static-top.css | 8 ++++++-- examples/sticky-footer/sticky-footer.css | 9 --------- 5 files changed, 12 insertions(+), 18 deletions(-) (limited to 'examples') diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html index df6346217..940897991 100644 --- a/examples/navbar-fixed-top/index.html +++ b/examples/navbar-fixed-top/index.html @@ -61,7 +61,8 @@

Navbar example

-

This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.

+

This example is a quick exercise to illustrate how the default, static and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.

+

To see the difference between static and fixed top navbars, just scroll.

View navbar docs »

diff --git a/examples/navbar-fixed-top/navbar-fixed-top.css b/examples/navbar-fixed-top/navbar-fixed-top.css index 1e23e9e5f..b0c883742 100644 --- a/examples/navbar-fixed-top/navbar-fixed-top.css +++ b/examples/navbar-fixed-top/navbar-fixed-top.css @@ -1,7 +1,4 @@ body { -padding-top: 60px; + min-height: 2000px; + padding-top: 70px; } - -.jumbotron { -margin-top: 20px; -} \ No newline at end of file diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html index 4ca88f02b..10da9d49a 100644 --- a/examples/navbar-static-top/index.html +++ b/examples/navbar-static-top/index.html @@ -62,7 +62,8 @@

Navbar example

-

This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.

+

This example is a quick exercise to illustrate how the default, static and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.

+

To see the difference between static and fixed top navbars, just scroll.

View navbar docs »

diff --git a/examples/navbar-static-top/navbar-static-top.css b/examples/navbar-static-top/navbar-static-top.css index 0e34ecc69..59a37e75a 100644 --- a/examples/navbar-static-top/navbar-static-top.css +++ b/examples/navbar-static-top/navbar-static-top.css @@ -1,3 +1,7 @@ -.jumbotron { -margin-top: 30px; +body { + min-height: 2000px; +} + +.navbar-static-top { + margin-bottom: 19px; } \ No newline at end of file diff --git a/examples/sticky-footer/sticky-footer.css b/examples/sticky-footer/sticky-footer.css index 3da136e7c..45be6ccbc 100644 --- a/examples/sticky-footer/sticky-footer.css +++ b/examples/sticky-footer/sticky-footer.css @@ -24,15 +24,6 @@ body { background-color: #f5f5f5; } -/* Lastly, apply responsive CSS fixes as necessary */ -@media (max-width: 767px) { - #footer { - margin-left: -20px; - margin-right: -20px; - padding-left: 20px; - padding-right: 20px; - } -} /* Custom page CSS -------------------------------------------------- */ -- cgit v1.2.3 From af7b072a74f187f3c5f57a363ac9e1b19f7a35f5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 13:50:17 -0700 Subject: basic cleanup on carousel example (fixes #9709 and #9700) --- examples/carousel/carousel.css | 26 ++++++++++---------------- examples/carousel/index.html | 42 +++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 31 deletions(-) (limited to 'examples') diff --git a/examples/carousel/carousel.css b/examples/carousel/carousel.css index dd7dfc424..452fdfeed 100644 --- a/examples/carousel/carousel.css +++ b/examples/carousel/carousel.css @@ -78,25 +78,9 @@ body { .featurette-divider { margin: 80px 0; /* Space out the Bootstrap
more */ } -.featurette { - padding-top: 120px; /* Vertically center images part 1: add padding above and below text. */ - overflow: hidden; /* Vertically center images part 2: clear their floats. */ -} -.featurette-image { - margin-top: -120px; /* Vertically center images part 3: negative margin up the image the same amount of the padding to center it. */ -} - -/* Give some space on the sides of the floated elements so text doesn't run right into it. */ -.featurette-image.pull-left { - margin-right: 40px; -} -.featurette-image.pull-right { - margin-left: 40px; -} /* Thin out the marketing headings */ .featurette-heading { - font-size: 50px; font-weight: 300; line-height: 1; letter-spacing: -1px; @@ -131,4 +115,14 @@ body { line-height: 1.4; } + .featurette-heading { + font-size: 50px; + } + +} + +@media (min-width: 992px) { + .featurette-heading { + margin-top: 120px; + } } diff --git a/examples/carousel/index.html b/examples/carousel/index.html index 6e5edbbec..fa95ab64b 100644 --- a/examples/carousel/index.html +++ b/examples/carousel/index.html @@ -69,7 +69,7 @@
- +

Example headline.

@@ -79,7 +79,7 @@
- +

Another example headline.

@@ -89,7 +89,7 @@
- +

One more for good measure.

@@ -138,26 +138,38 @@
-
- -

First featurette heading. It'll blow your mind.

-

Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

+
+
+

First featurette heading. It'll blow your mind.

+

Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

+
+
+ +
-
- -

Oh yeah, it's that good. See for yourself.

-

Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

+
+
+ +
+
+

Oh yeah, it's that good. See for yourself.

+

Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

+
-
- -

And lastly, this one. Checkmate.

-

Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

+
+
+

And lastly, this one. Checkmate.

+

Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

+
+
+ +
-- cgit v1.2.3 From e6f185acad5741fcbe0b3305e0660e5e6ea4f41c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 14:01:32 -0700 Subject: Justified nav now responsive; example updated accordingly (fixes #9708) --- examples/justified-nav/justified-nav.css | 33 +++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) (limited to 'examples') diff --git a/examples/justified-nav/justified-nav.css b/examples/justified-nav/justified-nav.css index cabd36d16..be983ba6b 100644 --- a/examples/justified-nav/justified-nav.css +++ b/examples/justified-nav/justified-nav.css @@ -27,8 +27,8 @@ body { } /* Customize the nav-justified links to be fill the entire space of the .navbar */ + .nav-justified { - max-height: 52px; background-color: #eee; border-radius: 5px; border: 1px solid #ccc; @@ -39,8 +39,7 @@ body { color: #777; font-weight: bold; text-align: center; - border-left: 1px solid rgba(255,255,255,.75); - border-right: 1px solid rgba(0,0,0,.1); + border-bottom: 1px solid #d5d5d5; background-color: #e5e5e5; /* Old browsers */ background-repeat: repeat-x; /* Repeat the gradient */ background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e5e5e5 100%); /* FF3.6+ */ @@ -59,17 +58,33 @@ body { box-shadow: inset 0 3px 7px rgba(0,0,0,.15); } .nav-justified > li:first-child > a { - border-left: 0; - border-top-left-radius: 5px; - border-bottom-left-radius: 5px; + border-radius: 5px 5px 0 0; } .nav-justified > li:last-child > a { - border-right: 0; - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; + border-bottom: 0; + border-radius: 0 0 5px 5px; +} + +@media (min-width: 768px) { + .nav-justified { + max-height: 52px; + } + .nav-justified > li > a { + border-left: 1px solid #fff; + border-right: 1px solid #d5d5d5; + } + .nav-justified > li:first-child > a { + border-left: 0; + border-radius: 5px 0 0 5px; + } + .nav-justified > li:last-child > a { + border-radius: 0 5px 5px 0; + border-right: 0; + } } + /* Responsive: Portrait tablets and up */ @media screen and (min-width: 768px) { /* Remove the padding we set earlier */ -- cgit v1.2.3 From 62083a45b7864d23231505d1c9c6bcdfab31e52a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 14:12:18 -0700 Subject: fixes #9701: fix up offcanvas example --- examples/offcanvas/index.html | 2 +- examples/offcanvas/offcanvas.css | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'examples') diff --git a/examples/offcanvas/index.html b/examples/offcanvas/index.html index fcfe48fa8..5d6b7b813 100644 --- a/examples/offcanvas/index.html +++ b/examples/offcanvas/index.html @@ -82,7 +82,7 @@
- + + + + - \ No newline at end of file + -- cgit v1.2.3