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 9c343dc172c3b9cff5f0715038e30b1e6f60c05f..b25535eb6e6e9c11fdd39db26d8939c9189273b6 100644 (file)
--- 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 002a3ff07551fa5e410f8cc267f01cdbb5fe0fa0..2963c75defafe40b7c4ae528287cad2111f6c8a4 100644 (file)
--- 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;
   }
 }