diff options
| author | Josh Angell <josh@supercooldesign.co.uk> | 2012-02-22 15:29:12 +0000 |
|---|---|---|
| committer | Josh Angell <josh@supercooldesign.co.uk> | 2012-02-22 15:29:12 +0000 |
| commit | 9436971169d7258021ed94848f743a877d2aabd9 (patch) | |
| tree | b56a4e988f181a9f29dfe347cac0e1d4f84e81d3 | |
| parent | 85909349b017e386b17fb91e5dc8228b24c5d07d (diff) | |
| parent | 56c8c3f424ea9dd71ea251a31795145edd124bf1 (diff) | |
Merge branch 'supercool' of ssh://github.com/mysociety/fixmystreet into supercool
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 7 | ||||
| -rw-r--r-- | web/js/fixmystreet.js | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 635e5fa8c..58b79b66d 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -401,6 +401,11 @@ textarea.form-error { background-color:#ffeeee; } +// XXX This is a repeat from core +div.label-valid { + background-color: white; +} + /* LAYOUT */ // Padding creates page margins on mobile @@ -1051,4 +1056,4 @@ a:hover.rap-notes-trigger { } } } -}
\ No newline at end of file +} diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 6abec282c..513d6da29 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -144,7 +144,8 @@ $(function(){ // 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 ) { - element.parent('div').before( error ); + var l = element.prev('label') || element; + l.before( error ); }, submitHandler: function(form) { if (form.submit_problem) { @@ -286,4 +287,4 @@ $(function(){ $('.form-focus-trigger').on('focus', function(){ $('.form-focus-hidden').fadeIn(500); }); -});
\ No newline at end of file +}); |