From e6e0e2ac9b0a31979531b6add3d1c8aaceb65f2e Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 18 Aug 2012 16:50:26 -0700
Subject: fixes #4442: allow for .btn within a .btn-toolbar without .btn-group

---
 less/button-groups.less | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/less/button-groups.less b/less/button-groups.less
index cbb237a61..1cc758b7f 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -18,12 +18,17 @@
 
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
+  font-size: 0; // Hack to remove whitespace that results from using inline-block
   margin-top: @baseLineHeight / 2;
   margin-bottom: @baseLineHeight / 2;
   .btn-group {
     display: inline-block;
     .ie7-inline-block();
   }
+  .btn-group + .btn,
+  .btn + .btn-group {
+    margin-left: 5px;
+  }
 }
 
 // Float them, remove border radius, then re-add to first and last elements
-- 
cgit v1.2.3