Merge branch 'staging' into 171142818-fix-portfolio-validations

2020-02-07 06:46:24 -05:00
parent 589646fd90 960351fa3a
commit f4715fde95
10 changed files with 15 additions and 7 deletions
--- a/styles/core/_util.scss
+++ b/styles/core/_util.scss
@@ -98,3 +98,7 @@ hr {
 .usa-section {
  padding: 0;
 }
+
+.form {
+  margin-bottom: $action-footer-height + $large-spacing;
+}
--- a/styles/core/_variables.scss
+++ b/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
--- a/styles/elements/_action_group.scss
+++ b/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;
--- a/styles/sections/_task_order.scss
+++ b/styles/sections/_task_order.scss
@@ -1,6 +1,5 @@
 .task-order {
  margin-top: $gap * 4;
-  margin-bottom: $footer-height;
  width: 900px;

  &__amount {