From: Mark Otto <markotto@twitter.com>
Date: Mon, 12 Mar 2012 05:28:37 +0000 (-0700)
Subject: enable button groups in modal-footer by removing 5px added margin between .btn
X-Git-Tag: v2.0.2~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac7f571e536f4a6d5ee28fba50810d84e4dc1403;p=thirdparty%2Fbootstrap.git

enable button groups in modal-footer by removing 5px added margin between .btn
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index c92cbb7874..1b149b0021 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index a0a18e8964..b1490bae85 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3323,6 +3323,9 @@ input[type="submit"].btn.btn-small {
   margin-left: 5px;
   margin-bottom: 0;
 }
+.modal-footer .btn-group .btn + .btn {
+  margin-left: -1px;
+}
 .tooltip {
   position: absolute;
   z-index: 1020;
diff --git a/less/modals.less b/less/modals.less
index b6f71ffff2..4fccea7386 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -83,4 +83,8 @@
     margin-left: 5px;
     margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
   }
+  // but override that for button groups
+  .btn-group .btn + .btn {
+    margin-left: -1px;
+  }
 }