From a8d533cef7b1530c60a726194cf39469d79bc232 Mon Sep 17 00:00:00 2001 From: nilsding Date: Wed, 7 Jan 2015 07:02:07 +0100 Subject: [PATCH] markdown for comments and in the bio --- app/views/shared/_comments.html.haml | 3 ++- app/views/user/_profile_info.html.haml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/shared/_comments.html.haml b/app/views/shared/_comments.html.haml index 9cc96775..7af9c262 100644 --- a/app/views/shared/_comments.html.haml +++ b/app/views/shared/_comments.html.haml @@ -25,7 +25,8 @@ %a{href: '#', data: { action: 'ab-comment-report', c_id: comment.id }} %i.fa.fa-exclamation-triangle Report - %p.comments--content= comment.content + %p.comments--content + = markdown 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 }} diff --git a/app/views/user/_profile_info.html.haml b/app/views/user/_profile_info.html.haml index cf86eac8..01b60fb2 100644 --- a/app/views/user/_profile_info.html.haml +++ b/app/views/user/_profile_info.html.haml @@ -25,7 +25,7 @@ .profile--username = @user.screen_name - unless @user.bio.blank? - %p.profile--text= @user.bio + %p.profile--text= markdown @user.bio - unless @user.website.blank? %p.profile--text %i.fa.fa-globe