diff options
| author | Mark Otto <[email protected]> | 2013-05-03 14:57:07 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-03 14:57:07 -0700 |
| commit | af4a33f8c0149aeae2dfd8b810b626d2431d61c2 (patch) | |
| tree | adfb16c83e1bfce38b03b749ab0f59cb97182285 | |
| parent | e1d947f53e0591f2765290784f9e09f46e002558 (diff) | |
| parent | 0959a78ff17023d25efd552e214b9891cff92aea (diff) | |
| download | bootstrap-af4a33f8c0149aeae2dfd8b810b626d2431d61c2.tar.xz bootstrap-af4a33f8c0149aeae2dfd8b810b626d2431d61c2.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | docs/examples/sticky-footer-navbar.html | 7 | ||||
| -rw-r--r-- | docs/examples/sticky-footer.html | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html index 429b74f91..fe6681ef6 100644 --- a/docs/examples/sticky-footer-navbar.html +++ b/docs/examples/sticky-footer-navbar.html @@ -22,14 +22,13 @@ title: Sticky footer with navbar template height: 100%; /* Negative indent footer by its height */ margin: 0 auto -60px; + /* Pad bottom by footer height */ + padding: 0 0 60px; } /* Set the fixed height of the footer here */ - #push, #footer { height: 60px; - } - #footer { background-color: #f5f5f5; } @@ -106,8 +105,6 @@ title: Sticky footer with navbar template <p class="lead">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 <code>#wrap</code> with <code>padding-top: 60px;</code> on the <code>.container</code>.</p> <p>Back to <a href="../sticky-footer">the default sticky footer</a> minus the navbar.</p> </div> - - <div id="push"></div> </div> <div id="footer"> diff --git a/docs/examples/sticky-footer.html b/docs/examples/sticky-footer.html index 62c108812..14fc1edeb 100644 --- a/docs/examples/sticky-footer.html +++ b/docs/examples/sticky-footer.html @@ -22,14 +22,13 @@ title: Sticky footer template height: 100%; /* Negative indent footer by its height */ margin: 0 auto -60px; + /* Pad bottom by footer height */ + padding: 0 0 60px; } /* Set the fixed height of the footer here */ - #push, #footer { height: 60px; - } - #footer { background-color: #f5f5f5; } @@ -71,8 +70,6 @@ title: Sticky footer template <p class="lead">Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS.</p> <p>Use <a href="../sticky-footer-navbar">the sticky footer with a fixed navbar</a> if need be, too.</p> </div> - - <div id="push"></div> </div> <div id="footer"> |