Merge branch 'staging' into 171114893-pdf-bug

styles/core/_util.scss

@@ -98,3 +98,7 @@ hr {
 .usa-section {
   padding: 0;
 }
+
+.form {
+  margin-bottom: $action-footer-height + $large-spacing;
+}

styles/core/_variables.scss

@@ -20,6 +20,7 @@ $max-panel-width: 90rem;
 $home-pg-icon-width: 6rem;
 $large-spacing: 4rem;
 $max-page-width: $max-panel-width + $sidenav-expanded-width + $large-spacing;
+$action-footer-height: 6rem;
 
 /*
  * USWDS Variables

styles/elements/_action_group.scss

@@ -42,6 +42,7 @@
   border-top: 1px solid $color-gray-lighter;
   z-index: 1;
   width: 100%;
+  height: $action-footer-height;
 
   &.action-group-footer--expand-offset {
     padding-left: $sidenav-expanded-width;

styles/sections/_task_order.scss

@@ -1,6 +1,5 @@
 .task-order {
   margin-top: $gap * 4;
-  margin-bottom: $footer-height;
   width: 900px;
 
   &__amount {

templates/applications/fragments/members.html

@@ -22,7 +22,7 @@
       {% include "fragments/flash.html" %}
   {% endif %}
 
-  <div class="panel">
+  <div class="panel{% if new_member_form%} form{% endif %}">
   {% if not application.members %}
     <div class='empty-state empty-state--centered empty-state--white panel__content'>
       <p class='empty-state__message'>

templates/applications/new/step_1.html

@@ -22,7 +22,7 @@
   {% include "fragments/flash.html" %}
 
   <base-form inline-template :enable-save="true">
-    <form method="POST" action="{{ action }}" v-on:submit="handleSubmit">
+    <form method="POST" action="{{ action }}" v-on:submit="handleSubmit" class="form">
       {{ form.csrf_token }}
       <div class="form-row">
         <div class="form-col">

templates/applications/new/step_2.html

@@ -21,7 +21,7 @@
   </p>
   <hr>
   <application-environments inline-template v-bind:initial-data='{{ form.data|tojson }}'>
-    <form method="POST" action="{{ url_for('applications.update_new_application_step_2', portfolio_id=portfolio.id, application_id=application.id) }}" v-on:submit="handleSubmit">
+    <form method="POST" action="{{ url_for('applications.update_new_application_step_2', portfolio_id=portfolio.id, application_id=application.id) }}" v-on:submit="handleSubmit" class="form">
       <div class="subheading">{{ 'portfolios.applications.environments_heading' | translate }}</div>
       <div class="panel">
         <div class="panel__content">

templates/portfolios/new/step_1.html

@@ -19,7 +19,7 @@
   {{ StickyCTA(text="portfolios.new.cta_step_1"|translate, context=("portfolios.new.sticky_header_context"|translate({"step": "1"}) )) }}
   <base-form inline-template>
     <div class="row">
-      <form id="portfolio-create" class="col" action="{{ url_for('portfolios.create_portfolio') }}" method="POST">
+      <form id="portfolio-create" class="col form" action="{{ url_for('portfolios.create_portfolio') }}" method="POST">
         {{ form.csrf_token }}
         <div class="form-row form-row--bordered">
           <div class="form-col">

templates/task_orders/builder_base.html

@@ -28,7 +28,7 @@
 
       {% include "fragments/flash.html" %}
 
-      <div class="task-order">
+      <div class="task-order form">
         {% block to_builder_form_field %}{% endblock %}
       </div>
       <div