From a4de4b04eb5a249665551b81018486676de3a241 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 24 Jan 2019 10:10:10 -0500
Subject: [PATCH] Fix typos and styling for disabled fields

---
 styles/sections/_task_order.scss       |  9 +++++++++
 templates/task_orders/new/funding.html | 24 +++++++++++++-----------
 translations.yaml                      |  2 +-
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss
index b63d064f..01123107 100644
--- a/styles/sections/_task_order.scss
+++ b/styles/sections/_task_order.scss
@@ -266,6 +266,15 @@
       margin: 0;
     }
   }
+
+  input[type="text"]:disabled {
+    color: $color-gray-lighter;
+    font-style: italic;
+  }
+
+  .task-order__invite-dod-id {
+
+  }
 }
 
 .task-order-invitations {
diff --git a/templates/task_orders/new/funding.html b/templates/task_orders/new/funding.html
index 79efa6d6..93bdc1bf 100644
--- a/templates/task_orders/new/funding.html
+++ b/templates/task_orders/new/funding.html
@@ -29,7 +29,7 @@
     <h3 class="subheading">{{ "task_orders.new.funding.estimate_usage_title" | translate }}</h3>
     <p>{{ "task_orders.new.funding.estimate_usage_description" | translate }}</p>
     <p><a class="icon-link" target="_blank" href="{{ url_for('atst.jedi_csp_calculator') }}">
-      {{ Icon("link")}} Cloud Service Provider's estimate calculator
+      {{ Icon("link")}} Go to Cloud Service Provider’s estimate calculator
     </a></p>
     <p>{{ "task_orders.new.funding.estimate_usage_paragraph" | translate }}</p>
     <template v-if="showUpload">
@@ -51,18 +51,20 @@
 
     <hr>
 
-    <h3 class="subheading">{{ "task_orders.new.funding.cloud_calculations_title" | translate }}</h3>
-    <p>{{ "task_orders.new.funding.cloud_calculations_paragraph" | translate }}</p>
+    <div class="">
+      <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 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 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', placeholder="$0.00", disabled=(not config.CLASSIFIED)) }}
 
-    <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)) }}
+      <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.', placeholder="$0.00", disabled=(not config.CLASSIFIED)) }}
+    </div>
   </div>
 </funding>
 
diff --git a/translations.yaml b/translations.yaml
index 8a188943..b0233c8d 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -188,7 +188,7 @@ forms:
       description: Which of these describes how complex your team's use of the cloud will be? Select all that apply.
       storage: Storage
       data_analytics: Data Analytics
-      conus: CONUS Acess
+      conus: CONUS Access
       oconus: OCONUS Access
       tactical_edge: Tactical Edge Access
       not_sure: Not Sure