From b8b4b38a0a53dda7d0234b70ef2203ca534e96dd Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 10 Jun 2019 21:10:46 -0400 Subject: [PATCH] Update class name because it is used on all TO pages, add column for TotalsBox --- styles/sections/_task_order.scss | 11 +++++++++-- templates/portfolios/task_orders/review.html | 7 ++++--- templates/task_orders/edit.html | 10 ++++++---- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index 13d7e27b..dbea21b7 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -86,7 +86,7 @@ min-width: 14rem; } -.task-order-summary { +.task-order { margin-top: $gap * 4; hr { @@ -102,6 +102,7 @@ .col { flex-grow: 1; + max-width: 610px; } .h1, @@ -113,13 +114,19 @@ margin-top: $gap * 2; } + &.task-order__form { + .totals-box { + margin-top: 0; + } + } + .totals-box { padding: $gap * 4; padding-top: $gap * 2; flex-grow: unset; margin-left: $gap * 6; margin-top: $gap * 3; - width: 33.77%; + max-width: 336px; height: fit-content; background-color: $color-gray-lightest; } diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index 7f3e95d7..40dec4b3 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -26,7 +26,7 @@ Submit task order {% endcall %} -
+
{{ SemiCollapsibleText() }} @@ -101,8 +101,9 @@
- - {{ TotalsBox(task_order=task_order) }} +
+ {{ TotalsBox(task_order=task_order) }} +
diff --git a/templates/task_orders/edit.html b/templates/task_orders/edit.html index 9a63cb0f..fac96fb9 100644 --- a/templates/task_orders/edit.html +++ b/templates/task_orders/edit.html @@ -91,23 +91,23 @@ {% endcall %} -
+
{% include "fragments/flash.html" %} {% if task_order_id %} {% set action = url_for("task_orders.update", portfolio_id=portfolio.id, task_order_id=task_order_id) %} {% else %} {% set action = url_for("task_orders.update", portfolio_id=portfolio.id) %} {% endif %} -
+ {{ form.csrf_token }} {{ SemiCollapsibleText(paragraph="task_orders.new.form_help_text" | translate) }}
-
Add your task order
+
Add your task order
{{ TextInput(form.number, validation='taskOrderNumber') }}
@@ -339,7 +339,9 @@
{{ UploadInput(form.pdf) }}
- {{ TotalsBox(task_order=task_order) }} +
+ {{ TotalsBox(task_order=task_order) }} +