From 639658ee53809e5b11fff9f4a466addfc7a1674a Mon Sep 17 00:00:00 2001
From: Eric Morris <eric@zurb.com>
Date: Fri, 20 Sep 2013 09:41:13 -0700
Subject: [PATCH] Restore .error wrapper activation for <small> error messages
 in forms, without breaking required labels for Abide.

---
 scss/foundation/components/_forms.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scss/foundation/components/_forms.scss b/scss/foundation/components/_forms.scss
index f95fc2cd53..088aca4847 100644
--- a/scss/foundation/components/_forms.scss
+++ b/scss/foundation/components/_forms.scss
@@ -48,7 +48,7 @@ $input-prefix-font-color-alt: #fff !default;
 
 // We use these to style the error states for inputs and labels
 $input-error-message-padding: em-calc(6 4) !default;
-$input-error-message-top: -($form-spacing) - em-calc(5) !default;
+$input-error-message-top: 0;
 $input-error-message-font-size: em-calc(12) !default;
 $input-error-message-font-weight: bold !default;
 $input-error-message-font-color: #fff !default;
@@ -356,7 +356,6 @@ $glowing-effect-color: $input-focus-border-color !default;
   [data-abide] {
     .error small.error, span.error, small.error {
       @include form-error-message;
-      margin-top: 0;
     }
     span.error, small.error { display: none; }
   }
@@ -376,6 +375,7 @@ $glowing-effect-color: $input-focus-border-color !default;
       @include form-label-error-color;
     }
 
+    > small,
     small.error {
       @include form-error-message;
     }
@@ -388,6 +388,7 @@ $glowing-effect-color: $input-focus-border-color !default;
   input.error,
   textarea.error {
     @include form-error-color;
+    margin-bottom: 0;
   }
 
   .error select {