From 544b8ecab78c322bf826797374c0b10279cedf1f Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 14 Dec 2013 16:03:21 -0800
Subject: Fixes #10921: Add support for input groups within button toolbars

* Floats any `.input-group` within a toolbar
* Simplifies the CSS to remove sibling selectors and instead use a
negative amrgin on the parent with only `margin-left`

See it in action: http://jsbin.com/aGEcUqAT/1/.
---
 less/button-groups.less | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'less/button-groups.less')

diff --git a/less/button-groups.less b/less/button-groups.less
index ef9c34e77..794839d62 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -37,18 +37,17 @@
 
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
+  margin-left: -5px; // Offset the first child's margin
   &:extend(.clearfix all);
 
-  .btn-group {
+  .btn-group,
+  .input-group {
     float: left;
   }
-  // Space out series of button groups
   > .btn,
-  > .btn-group {
-    + .btn,
-    + .btn-group {
-      margin-left: 5px;
-    }
+  > .btn-group,
+  > .input-group {
+    margin-left: 5px;
   }
 }
 
-- 
cgit v1.2.3