Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/views/courses/_courses_jours.html.erb

@@ -7,9 +7,9 @@
     span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
     div.ke-toolbar .ke-outline{border:none;}
 
-    div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
+    div.respond-form .reply_btn{margin-left:625px;margin-top:5px;}
     div.recall_con{width:570px;}
-    div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
+    div.recall_con .reply_btn{margin-left:585px;margin-top:5px;}
     /*.ke-container{height: 80px !important;}*/
 </style>
 <%= content_for(:header_tags) do %>

app/views/projects/_project_jours.html.erb

@@ -7,7 +7,7 @@
     span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
     div.ke-toolbar .ke-outline{border:none;}
 
-    div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
+    div.respond-form .reply_btn{margin-left:626px;margin-top:5px;}
     div.recall_con{width:570px;}
     div.recall_con .reply_btn{margin-left:585px;margin-top:5px;}
 </style>