Merge pull request #40 from edx-solutions/design-refresh-fixes2

Design refresh fixes2

mentoring/public/css/mentoring.css

-.mentoring .title {
+.mentoring .title * {
     display: inline-block;
 }
 
 .mentoring .messages {
     display: none;
     margin-top: 10px;
-    border: 1px solid rgb(221, 221, 221);
-    padding: 12px 15px 20px;
+    border-top: 2px solid #eaeaea;
+    padding: 12px 0px 20px;
 }
 
 .mentoring .messages .title1 {
@@ -57,6 +57,8 @@
     margin-left: 10px;
     display: inline-block;
     vertical-align: middle;
+    font-size: 13px;
+    font-weight: bold;
 }
 
 .mentoring .attempts > span {

mentoring/public/css/questionnaire.css

@@ -29,7 +29,7 @@
     position: absolute;
     top: 0;
     right: 0;
-    background: none repeat scroll 0 0 #5C9DD5;
+    background: none repeat scroll 0 0 #66A5B5;
     font-family: arial;
     font-size: 14px;
     height: 100%;
@@ -55,9 +55,12 @@
     cursor: pointer;
     position: absolute;
     top: 5px;
-    right: 0px;
+    right: 3px;
     width: 18px;
     height: 21px;
+    font-family: FontAwesome;
+    font-style: normal;
+    text-align: center;
 }
 
 .mentoring .questionnaire .choice-tips p,

mentoring/public/js/questionnaire.js

@@ -96,7 +96,7 @@ function MCQBlock(runtime, element) {
 
             if (_.isNull(result.submission)) {
                 messageView.showMessage('<div class="message-content">You have not provided an answer.</div>' +
-                                        '<i class="close icon-remove-sign fa-times-circle"></i>');
+                                        '<div class="close icon-remove-sign fa-times-circle"></div>');
             }
             else if (result.tips) {
                 var tips = _.find(result.tips, function(obj) {
@@ -141,7 +141,7 @@ function MRQBlock(runtime, element) {
 
             if (result.message) {
                 messageView.showMessage('<div class="message-content">' + result.message + '</div>'+
-                                        '<i class="close icon-remove-sign fa-times-circle"></i>');
+                                        '<div class="close icon-remove-sign fa-times-circle"></div>');
             }
 
             var questionnaireDOM = $('fieldset.questionnaire', element),

mentoring/templates/html/mentoring.html

@@ -5,8 +5,8 @@
   </div>
   {% if self.title %}
   <div class="title">
-    <h2 class="title main">{{ self.title.content }}</h2>
-    <span class="title weight">{% if self.weight %} ({{ self.weight }} Points Possible) {% endif %}</span>
+    <h2 class="main">{{ self.title.content }}</h2>
+    <span class="weight">{% if self.weight %} ({{ self.weight }} Points Possible) {% endif %}</span>
   </div>
   {% endif %}
   {% for name, c in named_children %}

mentoring/templates/html/tip_choice_group.html

 <div class="tip-choice-group">
-  <div class="close"></div>
   {% for tip_fragment in tips_fragments %}
     {{ tip_fragment.body_html|safe }}
   {% endfor %}
 </div>
+<div class="close icon-remove-sign fa-times-circle"></div>