fix legend margin collapse

diff --git a/bootstrap.css b/bootstrap.css
index 862b4c5b63551a895c657e5ed39ec8194d9e3714..cc5d7f019013f4f3f52b7e47ce77a981e7b6721c 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: Thu Jan 26 15:25:02 PST 2012
+ * Date: Thu Jan 26 15:39:24 PST 2012
  */
 article,
 aside,
@@ -475,7 +475,6 @@ legend {
   color: #333333;
   border: 0;
   border-bottom: 1px solid #eee;
-  -webkit-margin-collapse: separate;
 }
 label,
 input,
@@ -918,7 +917,8 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   margin-bottom: 9px;
 }
 .form-horizontal legend + .control-group {
-  padding-top: 27px;
+  margin-top: 18px;
+  -webkit-margin-top-collapse: separate;
 }
 .form-horizontal .control-group {
   margin-bottom: 18px;

diff --git a/bootstrap.min.css b/bootstrap.min.css
index c4b048f7423f371e16475e2502580c5ff6818978..1e41bf91153944dd7f5375649e191b9f59503c73 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -91,7 +91,7 @@ pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;b
 pre code{padding:0;background-color:transparent;}
 form{margin:0 0 18px;}
 fieldset{padding:0;margin:0;border:0;}
-legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
+legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;}
 label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
 label{display:block;margin-bottom:5px;color:#333333;}
 input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
@@ -176,7 +176,7 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir
 .form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
 .form-search label,.form-inline label{display:inline-block;}
 .control-group{margin-bottom:9px;}
-.form-horizontal legend+.control-group{padding-top:27px;}
+.form-horizontal legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;}
 .form-horizontal .control-group{margin-bottom:18px;}
 .form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;}
 .form-horizontal .controls{margin-left:160px;}

diff --git a/lib/forms.less b/lib/forms.less
index 4ee636683b416d60f9d3306324b6a473f6b3b5aa..9e2e1dc1bfefbe02f0032d673e6b8f4c96d9dac8 100644 (file)
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -28,7 +28,6 @@ legend {
   color: @grayDark;
   border: 0;
   border-bottom: 1px solid #eee;
-  -webkit-margin-collapse: separate;
 }
 
 // Set font for forms
@@ -490,7 +489,8 @@ select:focus:required:invalid {
 .form-horizontal {
   // Legend collapses margin, so we're relegated to padding
   legend + .control-group {
-    padding-top: @baseLineHeight * 1.5;
+    margin-top: @baseLineHeight;
+    -webkit-margin-top-collapse: separate;
   }
   // Increase spacing between groups
   .control-group {