diff --git a/atst/forms/data.py b/atst/forms/data.py index 3afb2ec7..d8619984 100644 --- a/atst/forms/data.py +++ b/atst/forms/data.py @@ -3,7 +3,7 @@ from atst.utils.localization import translate, translate_duration SERVICE_BRANCHES = [ - ("", "Select an option"), + ("", "- Select -"), ("Air Force, Department of the", "Air Force, Department of the"), ("Army and Air Force Exchange Service", "Army and Air Force Exchange Service"), ("Army, Department of the", "Army, Department of the"), diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py index 9c6ff8e6..496657ca 100644 --- a/atst/routes/task_orders/new.py +++ b/atst/routes/task_orders/new.py @@ -39,7 +39,7 @@ TASK_ORDER_SECTIONS = [ }, { "section": "review", - "title": "Review & Download", + "title": "Review", "template": "task_orders/new/review.html", "form": task_order_form.ReviewForm, }, diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index b524158e..ba98a55f 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -191,10 +191,6 @@ &.inactive { color: $color-gray-light; } - - &.subheading { - color: $color-gray; - } } .funding-summary__table { @@ -219,4 +215,35 @@ font-weight: $font-bold; } } + + .usa-input__title { + color: $color-gray; + } + + .subheading, .description { + color: $color-gray; + } + + .subheading--black { + .usa-input__title { + color: $color-black; + } + } + + .usa-input { + &.normal { + label { + font-weight: 400; + } + } + } + + .alert { + padding: 1.5rem; + + .usa-input { + width: 100%; + margin: 0; + } + } } diff --git a/templates/components/checkbox_input.html b/templates/components/checkbox_input.html index 92538843..8e40a0aa 100644 --- a/templates/components/checkbox_input.html +++ b/templates/components/checkbox_input.html @@ -1,7 +1,7 @@ -{% macro CheckboxInput(field, inline=False) -%} +{% macro CheckboxInput(field, inline=False, classes="") -%} -
+
diff --git a/templates/task_orders/new/app_info.html b/templates/task_orders/new/app_info.html index 881cff16..85b52a6c 100644 --- a/templates/task_orders/new/app_info.html +++ b/templates/task_orders/new/app_info.html @@ -16,7 +16,9 @@ {{ TextInput(form.portfolio_name, placeholder="The name of your office or organization") }} {{ TextInput(form.scope, paragraph=True) }}

{{ "task_orders.new.app_info.sample_scope" | translate | safe }}

-{{ OptionsInput(form.defense_component) }} +
+ {{ OptionsInput(form.defense_component) }} +

diff --git a/templates/task_orders/new/funding.html b/templates/task_orders/new/funding.html index a466a399..be24a652 100644 --- a/templates/task_orders/new/funding.html +++ b/templates/task_orders/new/funding.html @@ -29,7 +29,9 @@

{{ "task_orders.new.funding.estimate_usage_paragraph" | translate }}

- {{ form.pdf.label }} +
+ {{ form.pdf.label }} +
{{ form.pdf.description }}
@@ -39,12 +41,12 @@

{{ "task_orders.new.funding.cloud_calculations_title" | translate }}

{{ "task_orders.new.funding.cloud_calculations_paragraph" | translate }}

-

{{ "task_orders.new.funding.cloud_offerings_title" | translate }}

+

{{ "task_orders.new.funding.cloud_offerings_title" | translate }}

{{ "task_orders.new.funding.cloud_offerings_paragraph" | translate }}

{{ TextInput(form.clin_01, validation='dollars', placeholder="$0.00") }} {{ TextInput(form.clin_02, validation='dollars', disabled=(not config.CLASSIFIED)) }} -

{{ "task_orders.new.funding.support_assistance_title" | translate }}

+

{{ "task_orders.new.funding.support_assistance_title" | translate }}

{{ "task_orders.new.funding.support_assistance_paragraph" | translate }}

{{ TextInput(form.clin_03, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', placeholder="$0.00") }} {{ TextInput(form.clin_04, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', disabled=(not config.CLASSIFIED)) }} diff --git a/templates/task_orders/new/oversight.html b/templates/task_orders/new/oversight.html index e5dbb52b..ac8d39cb 100644 --- a/templates/task_orders/new/oversight.html +++ b/templates/task_orders/new/oversight.html @@ -25,7 +25,7 @@

{{ "task_orders.new.oversight.cor_info_title" | translate }}

{{ "task_orders.new.oversight.cor_info_paragraph" | translate }}

- {{ CheckboxInput(form.am_cor) }} + {{ CheckboxInput(form.am_cor, classes="normal") }}