pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update class name because it is used on all TO pages, add column for TotalsBox

Browse Source
This commit is contained in:
leigh-mil 2019-06-10 21:10:46 -04:00
parent 4285477f4d
commit b8b4b38a0a
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
styles/sections/_task_order.scss
View File

@ -86,7 +86,7 @@
min-width: 14rem; min-width: 14rem;
} }
.task-order-summary { .task-order {
margin-top: $gap * 4; margin-top: $gap * 4;
hr { hr {
@ -102,6 +102,7 @@
.col { .col {
flex-grow: 1; flex-grow: 1;
max-width: 610px;
} }
.h1, .h1,
@ -113,13 +114,19 @@
margin-top: $gap * 2; margin-top: $gap * 2;
} }
&.task-order__form {
.totals-box {
margin-top: 0;
}
}
.totals-box { .totals-box {
padding: $gap * 4; padding: $gap * 4;
padding-top: $gap * 2; padding-top: $gap * 2;
flex-grow: unset; flex-grow: unset;
margin-left: $gap * 6; margin-left: $gap * 6;
margin-top: $gap * 3; margin-top: $gap * 3;
width: 33.77%; max-width: 336px;
height: fit-content; height: fit-content;
background-color: $color-gray-lightest; background-color: $color-gray-lightest;
} }

5
templates/portfolios/task_orders/review.html
View File

@ -26,7 +26,7 @@
<a v-on:click="openModal('submit-to-1')" class="usa-button usa-button-primary" type="submit">Submit task order</a> <a v-on:click="openModal('submit-to-1')" class="usa-button usa-button-primary" type="submit">Submit task order</a>
{% endcall %} {% endcall %}
<div class="task-order-summary"> <div class="task-order">
{{ SemiCollapsibleText() }} {{ SemiCollapsibleText() }}
@ -101,8 +101,9 @@
</a> </a>
</div> </div>
</div> </div>
<div class="col totals">
{{ TotalsBox(task_order=task_order) }} {{ TotalsBox(task_order=task_order) }}
</div>
</div> </div>

8
templates/task_orders/edit.html
View File

@ -91,23 +91,23 @@
{% endcall %} {% endcall %}
<to-form inline-template v-bind:initial-clin-count="{{ form.clins.data | length }}"> <to-form inline-template v-bind:initial-clin-count="{{ form.clins.data | length }}">
<div class="task-order-summary"> <div>
{% include "fragments/flash.html" %} {% include "fragments/flash.html" %}
{% if task_order_id %} {% if task_order_id %}
{% set action = url_for("task_orders.update", portfolio_id=portfolio.id, task_order_id=task_order_id) %} {% set action = url_for("task_orders.update", portfolio_id=portfolio.id, task_order_id=task_order_id) %}
{% else %} {% else %}
{% set action = url_for("task_orders.update", portfolio_id=portfolio.id) %} {% set action = url_for("task_orders.update", portfolio_id=portfolio.id) %}
{% endif %} {% endif %}
<form id="new-task-order" action='{{ action }}' method="POST" autocomplete="off" enctype="multipart/form-data"> <form id="new-task-order" class="task-order task_order__form" action='{{ action }}' method="POST" autocomplete="off" enctype="multipart/form-data">
{{ form.csrf_token }} {{ form.csrf_token }}
{{ SemiCollapsibleText(paragraph="task_orders.new.form_help_text" | translate) }} {{ SemiCollapsibleText(paragraph="task_orders.new.form_help_text" | translate) }}
<hr> <hr>
<div class="h1">Add your task order</div>
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="h1">Add your task order</div>
{{ TextInput(form.number, validation='taskOrderNumber') }} {{ TextInput(form.number, validation='taskOrderNumber') }}
<hr> <hr>
@ -339,8 +339,10 @@
</div> </div>
{{ UploadInput(form.pdf) }} {{ UploadInput(form.pdf) }}
</div> </div>
<div class="col totals">
{{ TotalsBox(task_order=task_order) }} {{ TotalsBox(task_order=task_order) }}
</div> </div>
</div>
</form> </form>
</div> </div>
</to-form> </to-form>