Merge pull request #6831 from svbergerem/fix-conversations-message-content-overflow

Fix message content overflow in conversations
2016-05-13 04:54:44 +02:00 · 2016-05-13 04:54:44 +02:00 · f285b1c459
commit f285b1c459
parent 43601ce636 1de7f8ea9e
2 changed files with 3 additions and 1 deletions
--- a/app/assets/stylesheets/post-content.scss
+++ b/app/assets/stylesheets/post-content.scss
@ -1,3 +1,4 @@
+.message-content,
 .post-content {
  img { max-width: 100%; }
  .photo_attachments {
--- a/app/views/conversations/_message.haml
+++ b/app/views/conversations/_message.haml
@ -11,4 +11,5 @@
      = timeago(message.created_at)

      %div{ :class => direction_for(message.text) }
+        .message-content
          = message.message.markdownified