Reorder content and fix styling

This commit is contained in:
leigh-mil 2019-07-19 11:55:01 -04:00
parent a2decf0509
commit fe5328b1af
4 changed files with 34 additions and 28 deletions

View File

@ -83,7 +83,9 @@
}
&.icon-link--download {
@include icon-link-color($color-black) .icon {
font-weight: $font-normal;
padding-left: 0;
.icon {
@include icon-color($color-green);
}
}

View File

@ -24,7 +24,7 @@
hr {
border: 0;
border-bottom: 1px solid $color-gray-light;
border-bottom: 1px solid $color-gray-lighter;
margin-top: $gap * 4;
margin-bottom: $gap * 4;
}
@ -53,14 +53,20 @@
margin-top: $gap * 2;
}
.totals-box {
padding: $gap * 4;
padding-top: $gap * 2;
flex-grow: unset;
margin-left: $gap * 6;
display: table;
background-color: $color-gray-lightest;
min-width: 350px;
.task-order__review {
.h2 {
margin-bottom: $gap * 4;
}
.totals-box {
padding: $gap * 4;
padding-top: $gap * 2;
flex-grow: unset;
margin-left: $gap * 6;
display: table;
background-color: $color-gray-lightest;
min-width: 350px;
}
}
&.task_order__form {

View File

@ -3,15 +3,25 @@
{% from "components/totals_box.html" import TotalsBox %}
<div class="task-order">
<div class="task-order__review">
<div class="form-row">
<div class="form-col">
<div class="h1">
<div class="h2">
{{ "task_orders.review.review_your_task_order" | translate }}
</div>
<div class="h3">
Approved Task Order
</div>
<a class="icon-link icon-link--download" href="{{ url_for('task_orders.download_task_order_pdf', task_order_id=task_order.id) }}">
{{ Icon('check-circle-solid') }}
{{ task_order.pdf.filename }}
</a>
<hr>
<div class="col task-order__details">
<div class="h4">
<div class="h3">
{{ "task_orders.review.task_order_number" | translate }}
</div>
<div>{{task_order.number}}</div>
@ -61,18 +71,6 @@
</tbody>
</table>
{% endfor %}
<hr>
<div class="h3">
{{ "task_orders.review.supporting_document.title" | translate }}
</div>
<div class="h4">
<a class="icon-link icon-link--download" href="{{ url_for('task_orders.download_task_order_pdf', task_order_id=task_order.id) }}">
{{ Icon('check-circle-solid') }}
{{ task_order.pdf.filename }}
</a>
</div>
</div>
</div>
<div class="form-col">

View File

@ -324,8 +324,8 @@ portfolios:
task_orders:
review:
review_your_task_order: Review your task order
funding_summary: Funding summary
task_order_number: Task order number - 10 digit found in your system of record
funding_summary: Task Order Summary
task_order_number: Task Order Number
check_paragraph: Check to make sure the information you entered is correct. After submission, you will confirm this task order was signed by a contracting officer. Thereafter, you will be informed as soon as CCPO completes their review.
supporting_document:
title: Supporting document
@ -365,7 +365,7 @@ task_orders:
sign:
digital_signature_description: 'I acknowledge that I have read and fully understand the DoD CCPO JEDI agreements and completed all the necessary steps, as detailed in the Federal Acquisition Regulation (FAR).'
JEDICLINType:
JEDI_CLIN_1: 'CLIN 1:'
JEDI_CLIN_1: 'Base CLIN 0001: Unclassified IaaS and PaaS'
JEDI_CLIN_2: 'CLIN 2: Classified Cloud Services - 0002'
JEDI_CLIN_3: 'CLIN 3:'
JEDI_CLIN_4: 'CLIN 4:'