Form submit buttons no longer inline with inputs.

This was a cute space-saving feature at the time, but the layout made it
look like the button was specific to that input, rather than submitting
the whole form. Make similar buttons full width, and improve spacing.

4 files changed, 9 insertions, 17 deletions

diff --git a/templates/web/base/report/form/user_loggedout_by_email.html b/templates/web/base/report/form/user_loggedout_by_email.html
index f23a06186..4c19cdf76 100644
--- a/templates/web/base/report/form/user_loggedout_by_email.html
+++ b/templates/web/base/report/form/user_loggedout_by_email.html
@@ -41,19 +41,14 @@
   [% END %]
     <div class="general-notes" id="password_register_hint">
       [% IF c.cobrand.moniker == 'bromley' %]
-        <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports.') %]</p>
+        <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports.') %] [% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p>
       [% ELSE %]
-        <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>
+        <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %] [% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p>
       [% END %]
     </div>
 
-    <div class="form-txt-submit-box">
-        <input class="form-control js-password-validate" type="password" name="password_register" id="password_register" aria-describedby="password_register_hint" value="">
-        <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
-    </div>
+    <input class="form-control js-password-validate" type="password" name="password_register" id="password_register" aria-describedby="password_register_hint" value="">
 
-    <div class="general-notes">
-        <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p>
-    </div>
+    <input class="btn btn--primary btn--block btn--final js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
 
 </div>
diff --git a/templates/web/base/report/form/user_loggedout_password.html b/templates/web/base/report/form/user_loggedout_password.html
index 0d4759e51..72c055342 100644
--- a/templates/web/base/report/form/user_loggedout_password.html
+++ b/templates/web/base/report/form/user_loggedout_password.html
@@ -6,14 +6,13 @@
     [% IF field_errors.password %]
         <p class='form-error'>[% field_errors.password %]</p>
     [% END %]
-    <div class="form-txt-submit-box">
-        <input class="form-control" type="password" name="password_sign_in" id="password_sign_in" value="">
-        <input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Submit') %]">
-    </div>
+    <input class="form-control" type="password" name="password_sign_in" id="password_sign_in" value="">
 
     <div class="general-notes">
         <p><strong>[% loc('Forgotten your password?') %]</strong>
         [% loc('Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated.') %]</p>
     </div>
 
+    <input class="btn btn--primary btn--block btn--final js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Submit') %]">
+
 </div>
diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html
index 779bb8e34..8dd10f69f 100644
--- a/templates/web/base/report/new/form_user_loggedin.html
+++ b/templates/web/base/report/new/form_user_loggedin.html
@@ -67,7 +67,5 @@
     </div>
 [% END %]
 
-    <div class="form-txt-submit-box">
-        <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
-    </div>
+<input class="btn btn--primary btn--block btn--final js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
 </div>
diff --git a/templates/web/base/report/update/form_user_loggedin.html b/templates/web/base/report/update/form_user_loggedin.html
index aa25b2d80..f001d51b1 100644
--- a/templates/web/base/report/update/form_user_loggedin.html
+++ b/templates/web/base/report/update/form_user_loggedin.html
@@ -33,4 +33,4 @@
     <label class="inline" for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label>
 </div>
 
-<div class="clearfix"><input class="final-submit green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Post') %]"></div>
+<div class="clearfix"><input class="btn btn--primary btn--block btn--final js-submit_register" type="submit" name="submit_register" value="[% loc('Post') %]"></div>