From: Mark Otto Date: Tue, 8 Dec 2015 06:05:37 +0000 (-0800) Subject: fixes #18293: clean up sticky stuff X-Git-Tag: v4.0.0-alpha.2~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d45bd6106a9f8d1dea442798a956cf473fcea73;p=thirdparty%2Fbootstrap.git fixes #18293: clean up sticky stuff --- diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html index 73086c72d6..be7722696b 100644 --- a/docs/examples/sticky-footer-navbar/index.html +++ b/docs/examples/sticky-footer-navbar/index.html @@ -21,42 +21,42 @@ - + +
-
+

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 with padding-top: 60px; on the body > .container.

@@ -65,7 +65,7 @@
-

Place sticky footer content here.

+ Place sticky footer content here.
diff --git a/docs/examples/sticky-footer-navbar/sticky-footer-navbar.css b/docs/examples/sticky-footer-navbar/sticky-footer-navbar.css index ee80380630..07fd56a640 100644 --- a/docs/examples/sticky-footer-navbar/sticky-footer-navbar.css +++ b/docs/examples/sticky-footer-navbar/sticky-footer-navbar.css @@ -14,6 +14,7 @@ body { width: 100%; /* Set the fixed height of the footer here */ height: 60px; + line-height: 60px; /* Vertically center the text there */ background-color: #f5f5f5; } @@ -25,9 +26,6 @@ body { body > .container { padding: 60px 15px 0; } -.container .text-muted { - margin: 20px 0; -} .footer > .container { padding-right: 15px; diff --git a/docs/examples/sticky-footer/index.html b/docs/examples/sticky-footer/index.html index bbd23b786a..8321d151c5 100644 --- a/docs/examples/sticky-footer/index.html +++ b/docs/examples/sticky-footer/index.html @@ -22,7 +22,7 @@
-
+

Sticky footer

Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS.

@@ -31,7 +31,7 @@ diff --git a/docs/examples/sticky-footer/sticky-footer.css b/docs/examples/sticky-footer/sticky-footer.css index b6699e80ed..46578d1a56 100644 --- a/docs/examples/sticky-footer/sticky-footer.css +++ b/docs/examples/sticky-footer/sticky-footer.css @@ -14,6 +14,7 @@ body { width: 100%; /* Set the fixed height of the footer here */ height: 60px; + line-height: 60px; /* Vertically center the text there */ background-color: #f5f5f5; } @@ -27,6 +28,3 @@ body { max-width: 680px; padding: 0 15px; } -.container .text-muted { - margin: 20px 0; -}