kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

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
parent 9a0849d818 c6eca2c9ca
commit 976866dcaa
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/sticky-footer-navbar/sticky-footer-navbar.css
View File

@ -10,8 +10,7 @@ body {
/* Wrapper for page content to push down footer */ /* Wrapper for page content to push down footer */
#wrap { #wrap {
min-height: 100%; min-height: 100%;
height: auto !important; height: auto;
height: 100%;
/* Negative indent footer by its height */ /* Negative indent footer by its height */
margin: 0 auto -60px; margin: 0 auto -60px;
/* Pad bottom by footer height */ /* Pad bottom by footer height */
@ -43,4 +42,4 @@ body {
code { code {
font-size: 80%; font-size: 80%;
} }

5
examples/sticky-footer/sticky-footer.css
View File

@ -10,8 +10,7 @@ body {
/* Wrapper for page content to push down footer */ /* Wrapper for page content to push down footer */
#wrap { #wrap {
min-height: 100%; min-height: 100%;
height: auto !important; height: auto;
height: 100%;
/* Negative indent footer by its height */ /* Negative indent footer by its height */
margin: 0 auto -60px; margin: 0 auto -60px;
/* Pad bottom by footer height */ /* Pad bottom by footer height */
@ -36,4 +35,4 @@ body {
} }
.container .credit { .container .credit {
margin: 20px 0; margin: 20px 0;
} }