resolve issue with form fields and errors causing no space between fields with consecutive errors; needs more work, but will address later

mdo · mdo · commit 948c59ddb39a · 2011-10-03T21:43:53.000-07:00
diff --git 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 Sep 22 12:52:42 PDT 2011
+ * Date: Mon Oct  3 21:43:20 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).
@@ -173,7 +173,7 @@ textarea {
 /* Variables.less
  * Variables to customize the look and feel of Bootstrap
  * ----------------------------------------------------- */
-/* Variables.less
+/* Mixins.less
  * Snippets of reusable CSS to develop faster and keep code readable
  * ----------------------------------------------------------------- */
 /*
@@ -719,30 +719,30 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus {
   box-shadow: none;
   outline: 1px dotted #666;
 }
-form div.clearfix.error {
+form .clearfix.error {
   background: #fae5e3;
   padding: 10px 0;
-  margin: -10px 0 10px;
+  margin: 10px 0;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-form div.clearfix.error > label, form div.clearfix.error span.help-inline, form div.clearfix.error span.help-block {
+form .clearfix.error > label, form .clearfix.error span.help-inline, form .clearfix.error span.help-block {
   color: #9d261d;
 }
-form div.clearfix.error input, form div.clearfix.error textarea {
+form .clearfix.error input, form .clearfix.error textarea {
   border-color: #c87872;
   -webkit-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25);
   -moz-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25);
   box-shadow: 0 0 3px rgba(171, 41, 32, 0.25);
 }
-form div.clearfix.error input:focus, form div.clearfix.error textarea:focus {
+form .clearfix.error input:focus, form .clearfix.error textarea:focus {
   border-color: #b9554d;
   -webkit-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5);
   -moz-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5);
   box-shadow: 0 0 6px rgba(171, 41, 32, 0.5);
 }
-form div.clearfix.error .input-prepend span.add-on, form div.clearfix.error .input-append span.add-on {
+form .clearfix.error .input-prepend span.add-on, form .clearfix.error .input-append span.add-on {
   background: #f4c8c5;
   border-color: #c87872;
   color: #b9554d;
diff --git a/bootstrap.min.css b/bootstrap.min.css
diff --git a/docs/index.html b/docs/index.html
@@ -1036,7 +1036,14 @@ <h2>Default styles</h2>
             </div>
           </div><!-- /clearfix -->
           <div class="clearfix error">
-            <label for="xlInput2">X-Large input</label>
+            <label for="xlInput2">Input with error</label>
+            <div class="input">
+              <input class="xlarge error" id="xlInput2" name="xlInput2" size="30" type="text" />
+              <span class="help-inline">Small snippet of help text</span>
+            </div>
+          </div><!-- /clearfix -->
+          <div class="clearfix error">
+            <label for="xlInput2">Input with error</label>
             <div class="input">
               <input class="xlarge error" id="xlInput2" name="xlInput2" size="30" type="text" />
               <span class="help-inline">Small snippet of help text</span>
diff --git a/lib/forms.less b/lib/forms.less
@@ -159,10 +159,10 @@ select:focus {
 }
 
 // Error styles
-form div.clearfix.error {
+form .clearfix.error {
   background: lighten(@red, 57%);
   padding: 10px 0;
-  margin: -10px 0 10px;
+  margin: 10px 0;
   .border-radius(4px);
   @error-text: desaturate(lighten(@red, 25%), 25%);
   > label,
