rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse source
This commit is contained in:
Mark Otto 2013-04-28 14:27:58 -07:00
commit 5edfdc02f2
10 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/assets/css/bootstrap.css vendored
View file

@ -3490,7 +3490,7 @@ button.close {
.navbar {
position: relative;
padding: 10px 15px;
padding: 0 15px;
background-color: #eeeeee;
border-radius: 4px;
}
@ -3741,10 +3741,6 @@ button.close {
}
@media screen and (min-width: 768px) {
.navbar {
padding-top: 0;
padding-bottom: 0;
}
.navbar-brand {
float: left;
margin-right: 5px;