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

Remove unnecessary column around totals box and fix styling

Browse Source
This commit is contained in:
leigh-mil 2019-06-11 10:14:44 -04:00
parent b8b4b38a0a
commit 4b0a4628aa
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
styles/sections/_task_order.scss
View File

@ -114,23 +114,23 @@
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;
max-width: 336px; width: 33.77%;
height: fit-content; height: fit-content;
background-color: $color-gray-lightest; background-color: $color-gray-lightest;
} }
.task-order__form {
.totals-box {
margin-top: 0;
}
}
.panel { .panel {
@include shadow-panel; @include shadow-panel;
} }

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

@ -101,9 +101,7 @@
</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,14 +91,14 @@
{% 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> <div class="task-order">
{% 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" class="task-order task_order__form" action='{{ action }}' method="POST" autocomplete="off" enctype="multipart/form-data"> <form id="new-task-order" class="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) }}
@ -339,9 +339,7 @@
</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>