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 2426293e..133a0c8f 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 e119dd02..3ee5510d 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -229,4 +229,12 @@ color: $color-black; } } + + .usa-input { + .normal { + label { + font-weight: 400; + } + } + } } diff --git a/templates/components/checkbox_input.html b/templates/components/checkbox_input.html index 92538843..ab5babad 100644 --- a/templates/components/checkbox_input.html +++ b/templates/components/checkbox_input.html @@ -1,10 +1,10 @@ -{% macro CheckboxInput(field, inline=False) -%} +{% macro CheckboxInput(field, inline=False, classes="") -%}
- + {{ field() }} {{ field.label }} diff --git a/templates/task_orders/new/oversight.html b/templates/task_orders/new/oversight.html index e5dbb52b..5622b4fa 100644 --- a/templates/task_orders/new/oversight.html +++ b/templates/task_orders/new/oversight.html @@ -23,9 +23,17 @@
+<<<<<<< HEAD

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

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

{{ CheckboxInput(form.am_cor) }} +======= +

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

+

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

+ +
+ {{ CheckboxInput(form.am_cor, classes="normal") }} +>>>>>>> Styling and text fixes