2 files changed, 14 insertions, 9 deletions

diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index 58b79b66d..38273ac7a 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -388,22 +388,22 @@ div.form-error,
 p.form-error {
   background:#ff0000;
   color:#fff;
-  padding:0.5em;
-  margin:0 1em 0 0;
+  padding:0 0.5em;
+  margin:0 0.6em 0 -0.5em;
   width:auto;
-  margin-bottom:0.5em;
-  @include border-radius(0.25em);
+  @include border-radius(0.25em 0.25em 0 0);
 }
 
 input.form-error,
 textarea.form-error {
   border-color:#ff0000;
-  background-color:#ffeeee;
+  @include border-radius(0 0 0.25em 0.25em);
 }
 
 // XXX This is a repeat from core
-div.label-valid {
-    background-color: white;
+div.label-valid,
+p.label-valid {
+  background: #fff;
 }
 
 /* LAYOUT */
@@ -915,6 +915,11 @@ a:hover.rap-notes-trigger {
   display:none !important;
 }
 
+// hide anything with this class if js is working
+.js .hidden-js {
+  display: none !important;
+  visibility: hidden;
+}
 
 
 /* Front page */
diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js
index 513d6da29..47ca6efb7 100644
--- a/web/js/fixmystreet.js
+++ b/web/js/fixmystreet.js
@@ -139,13 +139,13 @@ $(function(){
         },
         messages: validation_strings,
         onkeyup: false,
+        onfocusout: false,
         errorElement: 'div',
         errorClass: 'form-error',
         // we do this to stop things jumping around on blur
         success: function (err) { if ( form_submitted ) { err.addClass('label-valid').removeClass('label-valid-hidden').html( ' ' ); } else { err.addClass('label-valid-hidden'); } },
         errorPlacement: function( error, element ) {
-            var l = element.prev('label') || element;
-            l.before( error );
+            element.before( error );
         },
         submitHandler: function(form) {
             if (form.submit_problem) {