Merge pull request #10729 from lipis/patch-2

Removed the unnecessary override and the !important from .wrap
twbs · Oct 21, 2013 · 976866d · 976866d
2 parents 9a0849d + c6eca2c
commit 976866d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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%;
-}
+}
diff --git 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;
-}
+}