fix margin on input buttons in modals

diff --git a/bootstrap.css b/bootstrap.css
index 3b04dc30e8568190c08dc5e4517b44f6e5e49b72..616e90bb1183f4288113500e3f0935bcd2e32864 100644 (file)
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Wed Jan 25 01:02:35 PST 2012
+ * Date: Wed Jan 25 08:34:06 PST 2012
  */
 article,
 aside,
@@ -2198,6 +2198,7 @@ i {
 .modal-footer .btn {
   float: right;
   margin-left: 5px;
+  margin-bottom: 0;
 }
 .tooltip {
   position: absolute;

diff --git a/bootstrap.min.css b/bootstrap.min.css
index 4cbd235022487f324131943a58f4e07ad8b571e2..57d76d94523ccbef0a69a9d47d2b1fe90530c37e 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -428,7 +428,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .modal-body{padding:15px;}
 .modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
 .modal-footer:after{clear:both;}
-.modal-footer .btn{float:right;margin-left:5px;}
+.modal-footer .btn{float:right;margin-left:5px;margin-bottom:0;}
 .tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;}.tooltip.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;}
 .tooltip.top{margin-top:-2px;}
 .tooltip.right{margin-left:2px;}

diff --git a/lib/modals.less b/lib/modals.less
index fe3f295b0b845f847a50f793f7900880198212bd..d6efccd39aaef831de50a16366b276d3e53a226d 100644 (file)
--- a/lib/modals.less
+++ b/lib/modals.less
@@ -60,5 +60,6 @@
   .btn {
     float: right;
     margin-left: 5px;
+    margin-bottom: 0; // account for input[type=submit] which gets the bottom margin like all other inputs
   }
 }