From 635297884dddce188395ddc8df15f1e85accb49f Mon Sep 17 00:00:00 2001
From: Jennifer Siegfried <jennifer.siegfried@perficient.com>
Date: Thu, 4 Aug 2016 17:03:23 -0600
Subject: [PATCH] Misc style updates

---
 .../stylesheets/molecules/_buttons.scss       |  1 +
 app/assets/stylesheets/molecules/_forms.scss  | 33 +++++++++++++------
 app/assets/stylesheets/pages/_error.scss      |  8 +++++
 app/views/candidate/_live_code.html.erb       |  8 ++---
 app/views/candidate/question.html.erb         |  2 +-
 5 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/app/assets/stylesheets/molecules/_buttons.scss b/app/assets/stylesheets/molecules/_buttons.scss
index 99b0066..5ef730e 100644
--- a/app/assets/stylesheets/molecules/_buttons.scss
+++ b/app/assets/stylesheets/molecules/_buttons.scss
@@ -87,6 +87,7 @@ button.tertiary-btn {
 html.no-js {
   .tertiary-btn.button-edit {
     border: none;
+    text-decoration: underline;
   }
   .button-save,
   .button-cancel {
diff --git a/app/assets/stylesheets/molecules/_forms.scss b/app/assets/stylesheets/molecules/_forms.scss
index 239e218..5a53c2d 100644
--- a/app/assets/stylesheets/molecules/_forms.scss
+++ b/app/assets/stylesheets/molecules/_forms.scss
@@ -5,6 +5,17 @@ fieldset {
   border: none;
   padding: 0;
   margin: 0;
+
+  &:disabled {
+    label {
+      display: none;
+    }
+    .form-group-multiples {
+      label {
+        display: block;
+      }
+    }
+  }
 }
 
 legend {
@@ -21,10 +32,12 @@ label {
 #{$all-text-inputs} {
   display: block;
   font-size: $base-font-size;
-  border-left:0;
-  border-top: 0;
-  border-right: 0;
-  border-bottom: 1px solid $secondary-color;
+  border: none !important;
+  border-bottom: 1px solid $secondary-color !important;
+  // border-left:0;
+  // border-top: 0;
+  // border-right: 0;
+  // border-bottom: 1px solid $secondary-color;
   box-shadow: none;
   border-radius: $base-border-radius;
   box-sizing: border-box;
@@ -35,9 +48,9 @@ label {
   font-family: $primary-font-face;
   line-height: 1.5em;
 
-  &:hover {
-    border-color: shade($base-border-color, 20%);
-  }
+  // &:hover {
+  //   border-color: shade($base-border-color, 20%);
+  // }
 
   &:focus {
     outline: none;
@@ -48,9 +61,9 @@ label {
     background-color: shade($base-background-color, 5%);
     cursor: default;
 
-    &:hover {
-      border: $base-border;
-    }
+    // &:hover {
+    //   border: $base-border;
+    // }
   }
 }
 button:disabled,
diff --git a/app/assets/stylesheets/pages/_error.scss b/app/assets/stylesheets/pages/_error.scss
index fbce04d..7b6b731 100644
--- a/app/assets/stylesheets/pages/_error.scss
+++ b/app/assets/stylesheets/pages/_error.scss
@@ -25,6 +25,14 @@
   background-color: #f39c12;
 }
 
+[data-id="live-coder-finish-later"] {
+  .warning {
+    margin-bottom: 2rem;
+    text-align: left;
+    padding: .5rem 1rem;
+  }
+}
+
 @media only screen and (min-width: $desktop) {
   .error-header {
     .page-title {
diff --git a/app/views/candidate/_live_code.html.erb b/app/views/candidate/_live_code.html.erb
index 95fdf44..57a4888 100644
--- a/app/views/candidate/_live_code.html.erb
+++ b/app/views/candidate/_live_code.html.erb
@@ -7,20 +7,20 @@
                  checked: Array(question.answer).include?('finish-later')
                   }
 %>
-<div class="js-error">
+<!-- <div class="js-error">
   Please revisit this page with JavaScript enabled to modify your answer.
-</div>
+</div> -->
 
 <% unless params[:action] == 'summary' %>
   <div data-id="live-coder-finish-later">
     <p class="warning">
       This is a question where you will be asked to write code, and it utilizes a JavaScript-enabled
-      environment. It looks like JavaScript is not loaded for some reason. Please check the box below
+      environment. It looks like JavaScript is not loaded. Please check the box below
       to acknowledge that you agree to come back at a later time to finish answering this question
       before you can submit the test.
     </p>
     <%= form.check_box(:answer, checkbox_html, true, '') %>
-    <%= form.label(option_id, 'I will come back later to finish this live coding question.') %>
+    <%= form.label(option_id, 'I will come back later to finish this code question') %>
   </div>
 <% end %>
 
diff --git a/app/views/candidate/question.html.erb b/app/views/candidate/question.html.erb
index e8beaa4..9337177 100644
--- a/app/views/candidate/question.html.erb
+++ b/app/views/candidate/question.html.erb
@@ -21,7 +21,7 @@
 
     <% if @status.on_summary %>
 
-      <div class="btn-container-summary">
+      <div class="btn-container-summary button-wrap">
         <input type="submit" name="submit" value="Save and return to summary">
       </div>