Merge pull request #10729 from lipis/patch-2

Removed the unnecessary override and the !important from .wrap
This commit is contained in:
Mark Otto 2013-10-20 23:12:19 -07:00
commit 976866dcaa
2 changed files with 4 additions and 6 deletions

View File

@ -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%;
}
}

View File

@ -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;
}
}