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] 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) }}