Merge conflicting changes from cynddl

media/css/style.css

@@ -415,6 +415,11 @@ div.comment {
 	font-weight: normal;
 }
 
+#report #icons span.tooltip_on {
+	font-weight: normal;
+	margin-right: 0.3em;
+}
+
 #editorial {
   margin-top: .7em; margin-bottom: 1em; padding: 0.5em;
   background-color: #EEDC94;

templates/view.html

@@ -49,7 +49,7 @@ $(document).ready(function() {
      }
      return false;
      });
-    $('span').hover(function(){$('span#'+this.id+'_tooltip').fadeIn();}, function(){$('span#'+this.id+'_tooltip').hide();});	
+    $('span').hover(function(){$('span#'+this.id+'_tooltip').fadeIn();}, function(){$('span#'+this.id+'_tooltip').hide();});
 });
 </script>
 {% endblock %}