From: Mark Otto <otto@github.com>
Date: Sat, 22 Jun 2013 00:21:44 +0000 (-0700)
Subject: Improve alignment of navbar brand and fix up left padding on list groups
X-Git-Tag: v3.0.0-rc1~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0e943399df374b03f9ed5f676f33e42f5e53a74;p=thirdparty%2Fbootstrap.git

Improve alignment of navbar brand and fix up left padding on list groups
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 685e2e9844..68b40ca7c0 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2956,7 +2956,8 @@ input[type="button"].btn-block {
 }
 
 .list-group {
-  margin: 0 0 20px;
+  padding-left: 0;
+  margin-bottom: 20px;
   background-color: #ffffff;
 }
 
@@ -3698,7 +3699,7 @@ button.close {
   .navbar-brand {
     float: left;
     margin-right: 5px;
-    margin-left: -5px;
+    margin-left: -15px;
   }
   .navbar-nav {
     float: left;
diff --git a/less/list-group.less b/less/list-group.less
index d812cc5f94..f9d9f612cd 100644
--- a/less/list-group.less
+++ b/less/list-group.less
@@ -7,7 +7,8 @@
 // Easily usable on <ul>, <ol>, or <div>.
 .list-group {
   // No need to set list-style: none; since .list-group-item is block level
-  margin: 0 0 20px; // reset all margins because ul and ol
+  margin-bottom: 20px;
+  padding-left: 0; // reset padding because ul and ol
   background-color: @list-group-bg;
 }
 
diff --git a/less/navbar.less b/less/navbar.less
index 54f4b75ab3..6246bd62c8 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -284,7 +284,7 @@
 
   .navbar-brand {
     float: left;
-    margin-left: -5px;
+    margin-left: -15px;
     margin-right: 5px;
   }
   .navbar-nav {