Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation

app/assets/stylesheets/scss/comments.scss

@@ -13,4 +13,12 @@
 .comments--count {
   z-index: 0;
   margin-top: -2em;
+}
+
+.comments--body {
+  overflow: visible;
+}
+
+.comments--content {
+  overflow: hidden;
 }

app/views/shared/_comments.html.haml

@@ -7,7 +7,7 @@
         .media
           .pull-left
             %img.img-rounded.answerbox--img{src: gravatar_url(comment.user)}
-          .media-body
+          .media-body.comments--body
             %h6.media-heading.answerbox--question-user= user_screen_name comment.user
             - if user_signed_in?
               .pull-right
@@ -24,7 +24,7 @@
                       %a{href: '#', name: 'ab-report', data: { a_id: comment.id }}
                         %i.fa.fa-exclamation-triangle
                         Report
-            %p= comment.content
+            %p.comments--content= comment.content
 - if user_signed_in?
   .form-group.has-feedback{name: 'ab-comment-new-group', 'data-a-id' => a.id}
     %input.form-control.comments--box{type: :text, placeholder: 'Comment...', name: 'ab-comment-new', data: {a_id: a.id }}