From 3ab1a0a040d247a7f0bec00037e9f3b1971b887e Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 17 Jan 2019 17:25:55 -0500
Subject: [PATCH 1/5] Change headers to gray

---
 styles/sections/_task_order.scss        | 18 ++++++++++++++----
 templates/task_orders/new/app_info.html |  4 +++-
 templates/task_orders/new/funding.html  |  8 +++++---
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss
index b524158e..e119dd02 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,18 @@
       font-weight: $font-bold;
     }
   }
+
+  .usa-input__title {
+    color: $color-gray;
+  }
+
+  .subheading {
+    color: $color-gray;
+  }
+
+  .subheading--black {
+    .usa-input__title {
+      color: $color-black;
+    }
+  }
 }
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) }}
 <p><i>{{ "task_orders.new.app_info.sample_scope" | translate | safe }}</i></p>
-{{ OptionsInput(form.defense_component) }}
+<div class="subheading--black">
+  {{ OptionsInput(form.defense_component) }}
+</div>
 
 <hr>
 
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 @@
     </a></p>
     <p>{{ "task_orders.new.funding.estimate_usage_paragraph" | translate }}</p>
     <div class="usa-input">
-      {{ form.pdf.label }}
+      <div class="usa-input__title">
+        {{ form.pdf.label }}
+      </div>
       {{ form.pdf.description }}
       <input type="file" disabled="disabled" />
     </div>
@@ -39,12 +41,12 @@
     <h3 class="subheading">{{ "task_orders.new.funding.cloud_calculations_title" | translate }}</h3>
     <p>{{ "task_orders.new.funding.cloud_calculations_paragraph" | translate }}</p>
 
-    <h4 class="task-order-form__heading">{{ "task_orders.new.funding.cloud_offerings_title" | translate }}</h4>
+    <h4 class="task-order-form__heading subheading">{{ "task_orders.new.funding.cloud_offerings_title" | translate }}</h4>
     <p>{{ "task_orders.new.funding.cloud_offerings_paragraph" | translate }}</p>
     {{ TextInput(form.clin_01, validation='dollars', placeholder="$0.00") }}
     {{ TextInput(form.clin_02, validation='dollars', disabled=(not config.CLASSIFIED)) }}
 
-    <h4 class="task-order-form__heading">{{ "task_orders.new.funding.support_assistance_title" | translate }}</h4>
+    <h4 class="task-order-form__heading subheading">{{ "task_orders.new.funding.support_assistance_title" | translate }}</h4>
     <p>{{ "task_orders.new.funding.support_assistance_paragraph" | translate }}</p>
     {{ 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)) }}

From 569576fce599e8c84255cf22608e2ad303e3d8f0 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Fri, 18 Jan 2019 09:59:51 -0500
Subject: [PATCH 2/5] Styling and text fixes

---
 atst/forms/data.py                       | 2 +-
 atst/routes/task_orders/new.py           | 2 +-
 styles/sections/_task_order.scss         | 8 ++++++++
 templates/components/checkbox_input.html | 4 ++--
 templates/task_orders/new/oversight.html | 8 ++++++++
 translations.yaml                        | 6 +++---
 6 files changed, 23 insertions(+), 7 deletions(-)

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="") -%}
   <checkboxinput name='{{ field.name }}' inline-template key='{{ field.name }}'>
     <div class='usa-input {% if field.errors %}usa-input--error{% endif %}'>
 
       <fieldset v-on:change="onInput" class="usa-input__choices {% if inline %}usa-input__choices--inline{% endif %}">
-        <legend>
+        <legend class="{{ 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 @@
 
         <hr />
 
+<<<<<<< HEAD
         <h3 class="subheading">{{ "task_orders.new.oversight.cor_info_title" | translate }}</h3>
         <p>{{ "task_orders.new.oversight.cor_info_paragraph" | translate }}</p>
         {{ CheckboxInput(form.am_cor) }}
+=======
+<h3 class="subheading">{{ "task_orders.new.oversight.cor_info_title" | translate }}</h3>
+<p>{{ "task_orders.new.oversight.cor_info_paragraph" | translate }}</p>
+<cor inline-template v-bind:initial-data='{{ form.data|tojson }}'>
+    <div class='usa-input'>
+        {{ CheckboxInput(form.am_cor, classes="normal") }}
+>>>>>>> Styling and text fixes
         <template v-if="!am_cor">
             {{ UserInfo(form.cor_first_name, form.cor_last_name, form.cor_email, form.cor_phone_number) }}
             {{ CheckboxInput(form.cor_invite) }}
diff --git a/translations.yaml b/translations.yaml
index f7131bc2..ecd7613e 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -200,7 +200,7 @@ forms:
       government_civilians: Government Civilians
       military: Military
       contractor: Contractor
-      other: "Other <em>(E.g. University or other partner)</em>"
+      other: "Other <em class='subheading'>(E.g. University or other partner)</em>"
     dev_team_other_label: Development Team Other
     team_experience:
       label: Team Experience
@@ -393,7 +393,7 @@ task_orders:
       performance_period_description: Choose the length of time your task order will cover.
       performance_period_paragraph: Because your funds will be lost if you don’t use them, we strongly recommend submitting small, short-duration task orders, usually a three month period. We’ll notify you when your period of performance is nearing the end so you can request your next set of funds with a new task order.
       estimate_usage_title: Estimate Your Cloud Usage
-      estimate_usage_description: Calculate how much your cloud usage will cost. A technical representative should help you complete this calculation. These calculations will become your CLINs.
+      estimate_usage_description: Calculate how much your cloud usage will cost. A technical representative from your team should help you complete this calculation. These calculations will become your CLINs.
       estimate_usage_paragraph: This is only an estimation tool to help you make an informed evaluation of what you expect to use. While you're tied to the dollar amount you specify in your task order, you're not obligated by the resources you indicate in the calculator.
       cloud_calculations_title: Cloud Usage Calculations
       cloud_calculations_paragraph: Enter the results of your cloud usage calculations.
@@ -408,7 +408,7 @@ task_orders:
       ko_info_paragraph: Your KO will need to approve funding for this Task Order by logging into the JEDI Cloud Portal, submitting the Task Order documents within their official system of record, and electronically signing. You might want to work with your program Financial Manager to get your TO documents moving in the right dirction.
       skip_ko_label: "Skip for now (We'll remind you to enter one later)"
       cor_info_title: Contracting Officer Representative (COR) Information
-      cor_info_paragraph: Your COR may assist in submitting the Task Order documents within thier official system of record. They may also be invited to log in an manage the Task Order entry within the JEDI Cloud portal.
+      cor_info_paragraph: Your COR may assist in submitting the Task Order documents within thier official system of record. They may also be invited to log in and manage the Task Order entry within the JEDI Cloud portal.
       so_info_title: Security Officer Information
       so_info_paragraph: Your Security Officer will need to answer some security configuration questions in order to generate a DD-254 document, then electronically sign.
     review:

From 43d1e01e107b5f5a5d36a7a205fb67545ddde61c Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Fri, 18 Jan 2019 10:21:36 -0500
Subject: [PATCH 3/5] Add blue background to DoD ID inputs

---
 styles/sections/_task_order.scss         | 9 +++++++++
 templates/task_orders/new/oversight.html | 8 --------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss
index 3ee5510d..c2d585af 100644
--- a/styles/sections/_task_order.scss
+++ b/styles/sections/_task_order.scss
@@ -237,4 +237,13 @@
       }
     }
   }
+
+  .alert {
+    padding: 1.5rem;
+
+    .usa-input {
+      width: 100%;
+      margin: 0;
+    }
+  }
 }
diff --git a/templates/task_orders/new/oversight.html b/templates/task_orders/new/oversight.html
index 5622b4fa..ac8d39cb 100644
--- a/templates/task_orders/new/oversight.html
+++ b/templates/task_orders/new/oversight.html
@@ -23,17 +23,9 @@
 
         <hr />
 
-<<<<<<< HEAD
         <h3 class="subheading">{{ "task_orders.new.oversight.cor_info_title" | translate }}</h3>
         <p>{{ "task_orders.new.oversight.cor_info_paragraph" | translate }}</p>
-        {{ CheckboxInput(form.am_cor) }}
-=======
-<h3 class="subheading">{{ "task_orders.new.oversight.cor_info_title" | translate }}</h3>
-<p>{{ "task_orders.new.oversight.cor_info_paragraph" | translate }}</p>
-<cor inline-template v-bind:initial-data='{{ form.data|tojson }}'>
-    <div class='usa-input'>
         {{ CheckboxInput(form.am_cor, classes="normal") }}
->>>>>>> Styling and text fixes
         <template v-if="!am_cor">
             {{ UserInfo(form.cor_first_name, form.cor_last_name, form.cor_email, form.cor_phone_number) }}
             {{ CheckboxInput(form.cor_invite) }}

From 281aa43edfc8df91ea0901b58848e95e17b8f617 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Tue, 22 Jan 2019 10:14:31 -0500
Subject: [PATCH 4/5] Change class name to better describe the element

---
 styles/sections/_task_order.scss | 2 +-
 translations.yaml                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss
index c2d585af..7b6c6906 100644
--- a/styles/sections/_task_order.scss
+++ b/styles/sections/_task_order.scss
@@ -220,7 +220,7 @@
     color: $color-gray;
   }
 
-  .subheading {
+  .subheading, .description {
     color: $color-gray;
   }
 
diff --git a/translations.yaml b/translations.yaml
index ecd7613e..f7af1404 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -200,7 +200,7 @@ forms:
       government_civilians: Government Civilians
       military: Military
       contractor: Contractor
-      other: "Other <em class='subheading'>(E.g. University or other partner)</em>"
+      other: "Other <em class='description'>(E.g. University or other partner)</em>"
     dev_team_other_label: Development Team Other
     team_experience:
       label: Team Experience

From 7eb40469c4af0fbd0fa6581d03f179eb5899a9bd Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Tue, 22 Jan 2019 10:14:53 -0500
Subject: [PATCH 5/5] Move classes to top level element

---
 styles/sections/_task_order.scss         | 2 +-
 templates/components/checkbox_input.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss
index 7b6c6906..ba98a55f 100644
--- a/styles/sections/_task_order.scss
+++ b/styles/sections/_task_order.scss
@@ -231,7 +231,7 @@
   }
 
   .usa-input {
-    .normal {
+    &.normal {
       label {
         font-weight: 400;
       }
diff --git a/templates/components/checkbox_input.html b/templates/components/checkbox_input.html
index ab5babad..8e40a0aa 100644
--- a/templates/components/checkbox_input.html
+++ b/templates/components/checkbox_input.html
@@ -1,10 +1,10 @@
 
 {% macro CheckboxInput(field, inline=False, classes="") -%}
   <checkboxinput name='{{ field.name }}' inline-template key='{{ field.name }}'>
-    <div class='usa-input {% if field.errors %}usa-input--error{% endif %}'>
+    <div class='usa-input {{ classes }} {% if field.errors %}usa-input--error{% endif %}'>
 
       <fieldset v-on:change="onInput" class="usa-input__choices {% if inline %}usa-input__choices--inline{% endif %}">
-        <legend class="{{ classes }}">
+        <legend>
           {{ field() }}
           {{ field.label }}