2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00

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

This commit is contained in:
Mark Otto
2013-04-28 14:27:58 -07:00
10 changed files with 10 additions and 18 deletions
+1 -5
View File
@@ -5,7 +5,7 @@
// Wrapper and base class
.navbar {
position: relative;
padding: 10px 15px;
padding: 0px 15px;
background-color: @navbar-bg;
border-radius: @border-radius-base;
// Prevent floats from breaking the navbar
@@ -264,10 +264,6 @@
@media screen and (min-width: @screen-tablet) {
.navbar {
padding-top: 0;
padding-bottom: 0;
}
.navbar-brand {
float: left;
margin-left: -5px;