From ae640d4f1cea3b12fcfbf2d6c8d5bb3c29c9aadf Mon Sep 17 00:00:00 2001
From: Sebastian Podjasek <sebastian.podjasek@intelliway.pl>
Date: Mon, 16 Dec 2013 22:47:09 +0100
Subject: Fix handling of btn-group placed inside input-group-btn (used for
 mixing dropdowns with normal buttons)

---
 less/input-groups.less | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

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

diff --git a/less/input-groups.less b/less/input-groups.less
index de1e68903..b486cf4d2 100644
--- a/less/input-groups.less
+++ b/less/input-groups.less
@@ -95,8 +95,10 @@
 .input-group .form-control:first-child,
 .input-group-addon:first-child,
 .input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
 .input-group-btn:first-child > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
   .border-right-radius(0);
 }
 .input-group-addon:first-child {
@@ -105,8 +107,10 @@
 .input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
 .input-group-btn:last-child > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child) {
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
   .border-left-radius(0);
 }
 .input-group-addon:last-child {
@@ -138,10 +142,16 @@
   }
 
   // Negative margin to only have a 1px border between the two
-  &:first-child > .btn {
-    margin-right: -1px;
+  &:first-child {
+    > .btn,
+    > .btn-group {
+      margin-right: -1px;
+    }
   }
-  &:last-child > .btn {
-    margin-left: -1px;
+  &:last-child {
+    > .btn,
+    > .btn-group {
+      margin-left: -1px;
+    }
   }
 }
-- 
cgit v1.2.3