From: Mark Otto <otto@github.com>
Date: Wed, 28 Nov 2012 09:51:04 +0000 (-0800)
Subject: Fixes #5927: Scope button group 5px button left margin to immediate children
X-Git-Tag: v2.2.2~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=783120dffaab396955b0ad237bf3a82a73a6e1dc;p=thirdparty%2Fbootstrap.git

Fixes #5927: Scope button group 5px button left margin to immediate children
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 9c343dc172..b25535eb6e 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3573,9 +3573,9 @@ input[type="submit"].btn.btn-mini {
   font-size: 0;
 }
 
-.btn-toolbar .btn + .btn,
-.btn-toolbar .btn-group + .btn,
-.btn-toolbar .btn + .btn-group {
+.btn-toolbar > .btn + .btn,
+.btn-toolbar > .btn-group + .btn,
+.btn-toolbar > .btn + .btn-group {
   margin-left: 5px;
 }
 
diff --git a/less/button-groups.less b/less/button-groups.less
index 002a3ff075..2963c75def 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -24,9 +24,9 @@
   font-size: 0; // Hack to remove whitespace that results from using inline-block
   margin-top: @baseLineHeight / 2;
   margin-bottom: @baseLineHeight / 2;
-  .btn + .btn,
-  .btn-group + .btn,
-  .btn + .btn-group {
+  > .btn + .btn,
+  > .btn-group + .btn,
+  > .btn + .btn-group {
     margin-left: 5px;
   }
 }