From fd7c3121fa0001446b072dc14dc7432cb2d60587 Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 13 Feb 2019 11:27:27 -0500 Subject: [PATCH 1/6] Make the input titles black --- styles/sections/_task_order.scss | 3 --- 1 file changed, 3 deletions(-) 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; From 3b3f81064cc66be1ba9fffb0fc8ace4afc25b5e6 Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 13 Feb 2019 11:27:44 -0500 Subject: [PATCH 2/6] Show input label on pdf upload --- templates/portfolios/task_orders/review.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index 4165eefd..bb826873 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -66,7 +66,7 @@
{{ "task_orders.ko_review.task_order_information"| translate }}
- {{ UploadInput(form.pdf) }} + {{ UploadInput(form.pdf, show_label=True) }} {{ TextInput(form.number) }} {{ TextInput(form.loa) }} {{ TextInput(form.custom_clauses, paragraph=True) }} From bb8932ce12492891a3026cab58782a2ddb75047a Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 13 Feb 2019 11:28:01 -0500 Subject: [PATCH 3/6] Show #1 on LOA --- translations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations.yaml b/translations.yaml index fb95f021..e2966d51 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: From bc7627ca273369eb5aae7fe8a485a04e8a48cd51 Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 13 Feb 2019 11:45:45 -0500 Subject: [PATCH 4/6] Add spacing above blue input sections --- styles/components/_forms.scss | 1 + 1 file changed, 1 insertion(+) 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 { From 04187c0f78d29e696e6611d23d6a3b36e66a8b3d Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 13 Feb 2019 12:57:11 -0500 Subject: [PATCH 5/6] Add a bit of spacing between columns of text --- styles/elements/_panels.scss | 4 +++ templates/components/review_field.html | 2 +- .../task_order_review/reporting.html | 30 +++++++++++-------- 3 files changed, 22 insertions(+), 14 deletions(-) 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/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 %} -
    - {% 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.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 %}
    From d69becc13a615a2b7e4be5ca55dfc6e9f24b152d Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 14 Feb 2019 14:40:37 -0500 Subject: [PATCH 6/6] Add placeholder for text inputs --- templates/portfolios/task_orders/review.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index bb826873..6c68e375 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -67,8 +67,8 @@
    {{ UploadInput(form.pdf, show_label=True) }} - {{ TextInput(form.number) }} - {{ TextInput(form.loa) }} + {{ TextInput(form.number, placeholder='1234567890') }} + {{ TextInput(form.loa, placeholder='1234567890') }} {{ TextInput(form.custom_clauses, paragraph=True) }}