aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-04-28 14:27:58 -0700
committerMark Otto <[email protected]>2013-04-28 14:27:58 -0700
commit5edfdc02f26cf4432a6cd798fc0064da779d6efb (patch)
tree8951632847de6ef68e7e7a41469b4535f4363d5a /less
parentbbee78b30b40ff0b1473a06ea7ecf5a42d51b614 (diff)
parent227c4639e4baef95c75ff82e849c5a3621980afa (diff)
downloadbootstrap-5edfdc02f26cf4432a6cd798fc0064da779d6efb.tar.xz
bootstrap-5edfdc02f26cf4432a6cd798fc0064da779d6efb.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'less')
-rw-r--r--less/navbar.less6
1 files changed, 1 insertions, 5 deletions
diff --git a/less/navbar.less b/less/navbar.less
index cc5e307e8..8cd43c300 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -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;