From: Mark Otto <otto@github.com>
Date: Fri, 16 Aug 2013 18:35:19 +0000 (-0700)
Subject: Fixed up examples more
X-Git-Tag: v3.0.0~78^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d36992180876fd233b079d4b8cad7fe65d2ec53;p=thirdparty%2Fbootstrap.git

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
---

diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html
index df63462179..940897991e 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 &raquo;</a>
         </p>
diff --git a/examples/navbar-fixed-top/navbar-fixed-top.css b/examples/navbar-fixed-top/navbar-fixed-top.css
index 1e23e9e5f1..b0c8837425 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 4ca88f02b9..10da9d49a1 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 &raquo;</a>
         </p>
diff --git a/examples/navbar-static-top/navbar-static-top.css b/examples/navbar-static-top/navbar-static-top.css
index 0e34ecc699..59a37e75a0 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 3da136e7ca..45be6ccbc1 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
 -------------------------------------------------- */