diff options
| author | Mark Otto <[email protected]> | 2013-08-16 11:35:19 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-16 11:35:19 -0700 |
| commit | 4d36992180876fd233b079d4b8cad7fe65d2ec53 (patch) | |
| tree | 0a741eb25c83414f31d87ac0a27bfb8dd278f1fd | |
| parent | e5f38207e0f8a356728e78f91a83b945934fd71d (diff) | |
| download | bootstrap-4d36992180876fd233b079d4b8cad7fe65d2ec53.tar.xz bootstrap-4d36992180876fd233b079d4b8cad7fe65d2ec53.zip | |
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
| -rw-r--r-- | examples/navbar-fixed-top/index.html | 3 | ||||
| -rw-r--r-- | examples/navbar-fixed-top/navbar-fixed-top.css | 7 | ||||
| -rw-r--r-- | examples/navbar-static-top/index.html | 3 | ||||
| -rw-r--r-- | examples/navbar-static-top/navbar-static-top.css | 8 | ||||
| -rw-r--r-- | examples/sticky-footer/sticky-footer.css | 9 |
5 files changed, 12 insertions, 18 deletions
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 @@ <!-- Main component for a primary marketing message or call to action --> <div class="jumbotron"> <h1>Navbar example</h1> - <p>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.</p> + <p>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.</p> + <p>To see the difference between static and fixed top navbars, just scroll.</p> <p> <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs »</a> </p> 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 @@ <!-- Main component for a primary marketing message or call to action --> <div class="jumbotron"> <h1>Navbar example</h1> - <p>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.</p> + <p>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.</p> + <p>To see the difference between static and fixed top navbars, just scroll.</p> <p> <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs »</a> </p> 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 -------------------------------------------------- */ |
