]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
enable button groups in modal-footer by removing 5px added margin between .btn
authorMark Otto <markotto@twitter.com>
Mon, 12 Mar 2012 05:28:37 +0000 (22:28 -0700)
committerMark Otto <markotto@twitter.com>
Mon, 12 Mar 2012 05:28:37 +0000 (22:28 -0700)
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
less/modals.less

index c92cbb7874e6acbc4568e0e7eea0430bb12b0f48..1b149b0021e76655e7992f140e547d0afc83d3f1 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index a0a18e89644d7ae8c4bd4066512b148d76570ab9..b1490bae85ce25b0119af169cc75e8ebdca88818 100644 (file)
@@ -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;
index b6f71ffff2f6fce9540ebe99be95697a71645d05..4fccea738668bd60e20f326d054c0f20b8ea63c0 100644 (file)
@@ -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;
+  }
 }