aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-10-09 20:57:38 -0700
committerMark Otto <[email protected]>2011-10-09 20:57:38 -0700
commit8f0671adfb70a7037dfcecf84e584ae38fc89b27 (patch)
tree2a36e3fcab8ba28d7f92428f00f328e29e900109
parent13cc27a6b4f0ebbe90fcd9d9409d50fd46f6022b (diff)
downloadbootstrap-8f0671adfb70a7037dfcecf84e584ae38fc89b27.tar.xz
bootstrap-8f0671adfb70a7037dfcecf84e584ae38fc89b27.zip
remove bottom margin from form in modals for temp fix"
-rw-r--r--bootstrap.css5
-rw-r--r--bootstrap.min.css1
-rw-r--r--lib/patterns.less3
3 files changed, 8 insertions, 1 deletions
diff --git a/bootstrap.css b/bootstrap.css
index fb0f5d74a..176c332e7 100644
--- 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: Sat Oct 8 09:21:16 PDT 2011
+ * Date: Sun Oct 9 20:57:28 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -2165,6 +2165,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
.modal-body {
padding: 15px;
}
+.modal-body form {
+ margin-bottom: 0;
+}
.modal-footer {
background-color: #f5f5f5;
padding: 14px 15px 15px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 4a7d1bcc2..23c532a7a 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -322,6 +322,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.modal.fade.in{top:50%;}
.modal-header{border-bottom:1px solid #eee;padding:5px 15px;}
.modal-body{padding:15px;}
+.modal-body form{margin-bottom:0;}
.modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;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;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;*display:inline;}
.modal-footer:after{clear:both;}
.modal-footer .btn{float:right;margin-left:5px;}
diff --git a/lib/patterns.less b/lib/patterns.less
index c3a8cf67b..6d02778b8 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -833,6 +833,9 @@ input[type=submit].btn {
.modal-body {
padding: 15px;
}
+.modal-body form {
+ margin-bottom: 0;
+}
.modal-footer {
background-color: #f5f5f5;
padding: 14px 15px 15px;