From a7d2bacf6f4bbc456d80cfe7695614479d622eb3 Mon Sep 17 00:00:00 2001
From: Xavier Antoviaque <xavier@antoviaque.org>
Date: Tue, 3 Jun 2014 16:29:03 -0400
Subject: [PATCH] css-fixes: Additional fixes of CSS from QA

* Proper alignment when MRQ/MCQ choices span over more than one line
* Show disabled submit button upon first load
* Remove extra color from submit button
* Size of feedback title
---
 mentoring/public/css/mentoring.css             | 14 +++++++++++---
 mentoring/public/css/questionnaire.css         | 13 ++++++-------
 mentoring/templates/html/mentoring.html        |  2 +-
 mentoring/templates/html/mrqblock_choices.html | 16 +++++++---------
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/mentoring/public/css/mentoring.css b/mentoring/public/css/mentoring.css
index 70e0fcd..f83286a 100644
--- a/mentoring/public/css/mentoring.css
+++ b/mentoring/public/css/mentoring.css
@@ -14,7 +14,7 @@
     text-transform: uppercase;
     font-weight: bold;
     font-style: normal;
-    font-size: 0.9em;
+    font-size: 14px;
     margin-bottom: 5px;
 }
 
@@ -86,10 +86,18 @@
     height:33.33px;
 }
 
-.mentoring input[type=button] {
+.mentoring input[type=button],
+.mentoring input[type=button]:focus {
     background-color: #3384ca;
 }
 
-.mentoring input[type=button][disabled], .mentoring input[type=button][disabled]:hover {
+.mentoring input[type=button][disabled],
+.mentoring input[type=button][disabled]:hover,
+.mentoring input[type=button][disabled]:focus {
     background-color: #cccccc;
 }
+
+.mentoring input[type="checkbox"],
+.mentoring input[type="radio"] {
+    margin: 0;
+}
diff --git a/mentoring/public/css/questionnaire.css b/mentoring/public/css/questionnaire.css
index 6e9def7..c172d3a 100644
--- a/mentoring/public/css/questionnaire.css
+++ b/mentoring/public/css/questionnaire.css
@@ -4,17 +4,12 @@
     margin-bottom: 10px;
 }
 
-.mentoring .choices .choice-checkbox {
-    display: inline-block;
-    margin-top: 5px;
-    margin-bottom: 5px;
-}
-
 .mentoring .questionnaire .choice-result {
     display: inline-block;
     width: 40px;
     vertical-align: middle;
     cursor: pointer;
+    float: left;
 }
 
 .mentoring .questionnaire .choice {
@@ -78,5 +73,9 @@
 }
 
 .mentoring .choice-label {
-    margin-top: 5px;
+    margin-top: 8px;
+    margin-bottom: 5px;
+    padding-left: 70px;
+    text-indent: -22px;
+    line-height: 1.3;
 }
diff --git a/mentoring/templates/html/mentoring.html b/mentoring/templates/html/mentoring.html
index 3e3624f..f37e5ed 100644
--- a/mentoring/templates/html/mentoring.html
+++ b/mentoring/templates/html/mentoring.html
@@ -14,7 +14,7 @@ <h2 class="main">{{ self.title.content }}</h2>
   {% endfor %}
   {% if self.display_submit %}
   <div class="submit">
-    <input type="button" class="input-main" value="Submit"></input>
+    <input type="button" class="input-main" value="Submit" disabled="disabled"></input>
     <div class="attempts" data-max_attempts="{{ self.max_attempts }}" data-num_attempts="{{ self.num_attempts }}"></div>
   </div>
   {% endif %}
diff --git a/mentoring/templates/html/mrqblock_choices.html b/mentoring/templates/html/mrqblock_choices.html
index 7532e75..7f1959b 100644
--- a/mentoring/templates/html/mrqblock_choices.html
+++ b/mentoring/templates/html/mrqblock_choices.html
@@ -8,15 +8,13 @@ <h3>QUESTION</h3>
     {% for choice in custom_choices %}
     <div class="choice">
       <div class="choice-result icon-2x"></div>
-      <div class="choice-checkbox">
-        <label class="choice-label">
-          <input class="choice-selector" type="checkbox" name="{{ self.name }}"
-                 value="{{ choice.value }}"
-                 {% if choice.value in self.student_choices %} checked{% endif %}>
-          {{ choice.content }}
-          </input>
-        </label>
-      </div>
+      <label class="choice-label">
+        <input class="choice-selector" type="checkbox" name="{{ self.name }}"
+               value="{{ choice.value }}"
+               {% if choice.value in self.student_choices %} checked{% endif %}>
+        {{ choice.content }}
+        </input>
+      </label>
       <div class="choice-tips"></div>
     </div>
     {% endfor %}