From 1de7f8ea9ea5c435a83559d916f9c0b69629f260 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Fri, 13 May 2016 00:58:17 +0200 Subject: [PATCH] Fix message content overflow in conversations --- app/assets/stylesheets/post-content.scss | 1 + app/views/conversations/_message.haml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/post-content.scss b/app/assets/stylesheets/post-content.scss index 015be7da6..c58f567e1 100644 --- 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 { diff --git a/app/views/conversations/_message.haml b/app/views/conversations/_message.haml index b20df1d98..996ae3bc5 100644 --- 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.message.markdownified + .message-content + = message.message.markdownified