diff --git a/styles/components/_forms.scss b/styles/components/_forms.scss index a65f93b4..f78f2dc3 100644 --- a/styles/components/_forms.scss +++ b/styles/components/_forms.scss @@ -77,6 +77,7 @@ .form__sub-fields { @include alert; @include alert-level('default'); + margin-top: $gap * 2; display: block; .usa-input { diff --git a/styles/elements/_panels.scss b/styles/elements/_panels.scss index 29b78c44..572a165a 100644 --- a/styles/elements/_panels.scss +++ b/styles/elements/_panels.scss @@ -68,6 +68,10 @@ } } + .panel__body { + margin-right: $gap * 2; + } + .panel__heading { padding: $gap * 2; diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index 530aa49a..b7727a77 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -281,9 +281,6 @@ } } - .usa-input__title { - color: $color-gray; - } .subheading, .description { color: $color-gray; diff --git a/templates/components/review_field.html b/templates/components/review_field.html index e05e8c70..3553f328 100644 --- a/templates/components/review_field.html +++ b/templates/components/review_field.html @@ -1,5 +1,5 @@ {% macro ReviewField(heading, field, filter=None) %} -
+

{{ heading }}

{% if field %}

{{ field | findFilter(filter) }}

diff --git a/templates/fragments/task_order_review/reporting.html b/templates/fragments/task_order_review/reporting.html index 718cc89f..49a37a9c 100644 --- a/templates/fragments/task_order_review/reporting.html +++ b/templates/fragments/task_order_review/reporting.html @@ -21,21 +21,25 @@ }}
-

{{ "task_orders.new.review.complexity"| translate }}

-{% if task_order.complexity %} - -{% else %} -

{{ RequiredLabel() }}

-{% endif %} +
+
+

{{ "task_orders.new.review.complexity"| translate }}

+ {% if task_order.complexity %} +
    + {% for item in task_order.complexity %} +
  • + {{ Icon('ok', classes='icon--gray icon--medium') }}{{ "forms.task_order.complexity.{}".format(item) | translate }}{% if item == 'other' %}: {{ task_order.complexity_other }}{% endif %} +
  • + {% endfor %} +
+ {% else %} +

{{ RequiredLabel() }}

+ {% endif %} +
+
-
+

{{ "task_orders.new.review.team"| translate }}

{% if task_order.dev_team %}
    diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index 4165eefd..6c68e375 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -66,9 +66,9 @@
    {{ "task_orders.ko_review.task_order_information"| translate }}
    - {{ UploadInput(form.pdf) }} - {{ TextInput(form.number) }} - {{ TextInput(form.loa) }} + {{ UploadInput(form.pdf, show_label=True) }} + {{ TextInput(form.number, placeholder='1234567890') }} + {{ TextInput(form.loa, placeholder='1234567890') }} {{ TextInput(form.custom_clauses, paragraph=True) }}
    diff --git a/translations.yaml b/translations.yaml index e9a239e4..eb6f5371 100644 --- a/translations.yaml +++ b/translations.yaml @@ -62,7 +62,7 @@ forms: pdf_label: Upload a copy of your Task Order document pdf_description: Upload a PDF of the Task Order that you entered in your system of record for your organization. to_number: Task Order Number - loa: Line of Accounting (LOA) #1 + loa: Line of Accounting (LOA) #1 custom_clauses_label: Task Order Custom Clauses (optional) custom_clauses_description: This will put a pause on the CSP access once the KO signs until the CCPO reviews that language to make sure it is legal. edit_member: