diff options
| author | Mark Otto <[email protected]> | 2013-10-20 23:12:19 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 23:12:19 -0700 |
| commit | 976866dcaacca2edd5a05c72134428a5d719e234 (patch) | |
| tree | f44b7ad56f17bb20cda0e3ac5003d901d5d46a5b | |
| parent | 9a0849d81882a55dcc7a3fbd1148f4c75dbc84d2 (diff) | |
| parent | c6eca2c9ca8db3ece7c4492b15c25e0d677fa7a5 (diff) | |
| download | bootstrap-976866dcaacca2edd5a05c72134428a5d719e234.tar.xz bootstrap-976866dcaacca2edd5a05c72134428a5d719e234.zip | |
Merge pull request #10729 from lipis/patch-2
Removed the unnecessary override and the !important from .wrap
| -rw-r--r-- | examples/sticky-footer-navbar/sticky-footer-navbar.css | 5 | ||||
| -rw-r--r-- | examples/sticky-footer/sticky-footer.css | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/examples/sticky-footer-navbar/sticky-footer-navbar.css b/examples/sticky-footer-navbar/sticky-footer-navbar.css index 6978a9997..4869de0e6 100644 --- a/examples/sticky-footer-navbar/sticky-footer-navbar.css +++ b/examples/sticky-footer-navbar/sticky-footer-navbar.css @@ -10,8 +10,7 @@ body { /* Wrapper for page content to push down footer */ #wrap { min-height: 100%; - height: auto !important; - height: 100%; + height: auto; /* Negative indent footer by its height */ margin: 0 auto -60px; /* Pad bottom by footer height */ @@ -43,4 +42,4 @@ body { code { font-size: 80%; -}
\ No newline at end of file +} diff --git a/examples/sticky-footer/sticky-footer.css b/examples/sticky-footer/sticky-footer.css index 45be6ccbc..db69addbb 100644 --- a/examples/sticky-footer/sticky-footer.css +++ b/examples/sticky-footer/sticky-footer.css @@ -10,8 +10,7 @@ body { /* Wrapper for page content to push down footer */ #wrap { min-height: 100%; - height: auto !important; - height: 100%; + height: auto; /* Negative indent footer by its height */ margin: 0 auto -60px; /* Pad bottom by footer height */ @@ -36,4 +35,4 @@ body { } .container .credit { margin: 20px 0; -}
\ No newline at end of file +} |
