From 53095028be8ac931dd76970e18249291912612a4 Mon Sep 17 00:00:00 2001
From: Jennifer Siegfried <jennifer.siegfried@perficient.com>
Date: Thu, 4 Aug 2016 16:25:12 -0600
Subject: [PATCH] Formatting updates

---
 app/assets/stylesheets/molecules/_buttons.scss | 7 ++++++-
 app/assets/stylesheets/molecules/_forms.scss   | 7 +++++++
 app/assets/stylesheets/pages/_error.scss       | 5 ++---
 app/assets/stylesheets/templates/_summary.scss | 6 +++++-
 app/views/candidate/saved.html.erb             | 6 +++---
 app/views/candidate/summary.html.erb           | 2 ++
 app/views/candidate/welcome.html.erb           | 6 +++---
 7 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/molecules/_buttons.scss b/app/assets/stylesheets/molecules/_buttons.scss
index 91b4daa..99b0066 100644
--- a/app/assets/stylesheets/molecules/_buttons.scss
+++ b/app/assets/stylesheets/molecules/_buttons.scss
@@ -53,7 +53,8 @@ button.tertiary-btn {
   display: none;
 }
 
-.button-cancel {
+.button-cancel,
+.tertiary-btn.button-cancel {
   color: #ef0734;
   border: 1px solid #ef0734;
   display: none;
@@ -78,6 +79,10 @@ button.tertiary-btn {
   cursor: default;
 }
 
+.button-wrap {
+  margin-top: 3rem;
+}
+
 // JS-enabled styles
 html.no-js {
   .tertiary-btn.button-edit {
diff --git a/app/assets/stylesheets/molecules/_forms.scss b/app/assets/stylesheets/molecules/_forms.scss
index c432e40..239e218 100644
--- a/app/assets/stylesheets/molecules/_forms.scss
+++ b/app/assets/stylesheets/molecules/_forms.scss
@@ -177,6 +177,13 @@ textarea {
   &:not(:disabled) + label:before {
     background-color: white;
   }
+  &:disabled {
+    + label {
+      &:after {
+        background-color: #888;
+      }
+    }
+  }
 }
 
 [type="checkbox"] {
diff --git a/app/assets/stylesheets/pages/_error.scss b/app/assets/stylesheets/pages/_error.scss
index 8c6c12b..fbce04d 100644
--- a/app/assets/stylesheets/pages/_error.scss
+++ b/app/assets/stylesheets/pages/_error.scss
@@ -2,9 +2,8 @@
     text-align: center;
     background-color: $accent-color-1;
     color: #fff;
-    padding-top: .5rem;
-    padding-bottom: .5rem;
-    margin-bottom: .5rem;
+    margin: 2rem 0 .5rem;
+    padding: .5rem 0;
 }
 
 .error-header {
diff --git a/app/assets/stylesheets/templates/_summary.scss b/app/assets/stylesheets/templates/_summary.scss
index 00a62d3..3c3060e 100644
--- a/app/assets/stylesheets/templates/_summary.scss
+++ b/app/assets/stylesheets/templates/_summary.scss
@@ -29,6 +29,10 @@
     }
     .answer-container {
       padding:2rem 0;
+
+      textarea:not(:disabled) {
+        background-color: white;
+      }
     }
   }
 }
@@ -50,7 +54,7 @@
     color: #fff;
     padding-top: .5rem;
     padding-bottom: .5rem;
-    margin-bottom: .5rem; 
+    margin-bottom: .5rem;
     animation-name: success-fadeout;
     animation-duration: 1.5s;
     animation-delay: 2s;
diff --git a/app/views/candidate/saved.html.erb b/app/views/candidate/saved.html.erb
index e08dfc0..bd7dda0 100644
--- a/app/views/candidate/saved.html.erb
+++ b/app/views/candidate/saved.html.erb
@@ -1,10 +1,10 @@
 <main class="styleguide_tpl">
   <p>
-    Your test results have been saved. You can visit again later with your candidate ID to complete
+    Your test results have been saved. You can visit again later with your Test ID to complete
     the test starting from where you left off.
   </p>
 
-  <div class="btn-return">
-    <a class="btn primary-btn" href="<%= question_path %>">Return to Test</a>
+  <div class="button-wrap">
+    <a class="btn primary-btn" href="<%= question_path %>">Return to test</a>
   </div>
 </main>
diff --git a/app/views/candidate/summary.html.erb b/app/views/candidate/summary.html.erb
index 208a2a0..2940027 100644
--- a/app/views/candidate/summary.html.erb
+++ b/app/views/candidate/summary.html.erb
@@ -5,6 +5,8 @@
     Once you're done, hit the button at the bottom of the page to submit your answers.
   </p>
 
+  <hr>
+
   <% @quiz.each do |question| %>
     <%= form_for(:answer, url: post_answer_path(answer_id: question.answer_id), html:{class: 'summary-form'}) do |form| %>
       <article class="answer-sec <%= question.input_type %>-type" data-qid="<%= question.question_id %>">
diff --git a/app/views/candidate/welcome.html.erb b/app/views/candidate/welcome.html.erb
index cee02ab..c98dda7 100644
--- a/app/views/candidate/welcome.html.erb
+++ b/app/views/candidate/welcome.html.erb
@@ -20,7 +20,7 @@
     answers, we will review your assessment and your recruiter will be in touch.
   </p>
 
-  <%= link_to question_path do %>
-    <button type="submit">Begin</button>
-  <% end %>
+  <div class="button-wrap">
+    <%= link_to "Begin", question_path, {class: 'btn'} %>
+  </div>
 </main>