mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

Merge branch '3.0.0-wip' into bs3_homepage

Browse Source 
Conflicts:
	customize.html
	examples/justified-nav/justified-nav.css
This commit is contained in:
Mark Otto
2013-08-18 19:02:42 -07:00
parent 578a14e14a 5bd2d7ed7e
commit 9dcae610e9
59 changed files with 3196 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/justified-nav/justified-nav.css
-9
View File
@@ -2,13 +2,6 @@ body {
padding-top: 20px;
}
/* Everything but the jumbotron gets side spacing for mobile first views */
.masthead,
.footer {
padding-left: 15px;
padding-right: 15px;
}
.footer {
border-top: 1px solid #eee;
margin-top: 40px;
@@ -83,8 +76,6 @@ body {
}
}
/* Responsive: Portrait tablets and up */
@media screen and (min-width: 768px) {
/* Remove the padding we set earlier */