diff options
| -rw-r--r-- | templates/web/fixmystreet/report/new/fill_in_details_form.html | 10 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/_mixins.scss | 10 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 1 | ||||
| -rw-r--r-- | web/js/fixmystreet.js | 6 |
4 files changed, 18 insertions, 9 deletions
diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html index 851f63332..10662183f 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -159,13 +159,14 @@ [% END %] <label class="hidden" for="form_may_show_nameme">[% loc('Your name') %]</label> - <input type="text" class="validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> + <input type="text" class="form-focus-trigger validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> - <div class="general-sidebar-notes"> + <div class="general-sidebar-notes form-focus-hidden"> <p class="dark">[% loc('We never show your email address or phone number.') %]</p> <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> </div> + [%# if there is nothing in the name field then set check box as default on form %] <div class="checkbox-group"> <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]> @@ -173,16 +174,15 @@ </div> <label class="hidden" for="form_phone">[% loc('Your phone number (optional)') %]</label> - <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number (optional)') %]"> + <input class="form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number (optional)') %]"> <label class="hidden" for="password_register">[% loc('Enter a new password (optional)') %]</label> - <div class="form-txt-submit-box"> + <div class="form-txt-submit-box form-focus-hidden"> <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a new password (optional)') %]"> <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> </div> </div> - </div> [% END %] diff --git a/web/cobrands/fixmystreet/_mixins.scss b/web/cobrands/fixmystreet/_mixins.scss index 29e7a7109..45bbd379d 100644 --- a/web/cobrands/fixmystreet/_mixins.scss +++ b/web/cobrands/fixmystreet/_mixins.scss @@ -1,9 +1,13 @@ // Button reset @mixin button-reset { cursor:pointer; - font-size: 1em; - font-family: 'Helvetica', 'Arial', sans-serif; - line-height: 1; + font:{ + size: 0.875em; + family: 'Helvetica', 'Arial', sans-serif; + weight:bold; + } + text-transform:uppercase; + line-height: 1.375em; padding:0.7em 0.5em 0.5em 0.5em; margin:0; width: auto; diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 9a950000e..838ca8c9b 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -611,7 +611,6 @@ input.red-btn{ input.final-submit { margin:1em 0.5em; float:right; - text-transform:uppercase; } .button-right, diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 005693fd3..75ccc3a9c 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -270,4 +270,10 @@ $(function(){ var foo = $('.wrapper').height() - 500; $('html, body').animate({scrollTop:foo}, 1000); }); + + + $('.form-focus-hidden').hide(); + $('.form-focus-trigger').on('focus', function(){ + $('.form-focus-hidden').fadeIn(500); + }); });
\ No newline at end of file |