From 1fae3c9e9a313700b234f5b49a0558fff012641a Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 20 Aug 2014 12:19:54 +0200 Subject: [PATCH] fix #728 --- app/coffee/modules/common.coffee | 2 +- app/coffee/modules/common/wisiwyg.coffee | 2 +- app/styles/layout/us-detail.scss | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/coffee/modules/common.coffee b/app/coffee/modules/common.coffee index 9174e7f2..ed6b86e7 100644 --- a/app/coffee/modules/common.coffee +++ b/app/coffee/modules/common.coffee @@ -280,7 +280,7 @@ ChangeDirective = -> avatar: getUserAvatar(comment.user.pk) userFullName: getUserFullName(comment.user.pk) creationDate: moment(comment.created_at).format("DD MMM YYYY HH:mm") - comment: taiga.nl2br(comment.comment_html) + comment: comment.comment_html changesText: buildChangesText(comment) hasChanges: countChanges(comment) > 0 }) diff --git a/app/coffee/modules/common/wisiwyg.coffee b/app/coffee/modules/common/wisiwyg.coffee index 62cd8788..2e0c803d 100644 --- a/app/coffee/modules/common/wisiwyg.coffee +++ b/app/coffee/modules/common/wisiwyg.coffee @@ -38,7 +38,7 @@ tgMarkitupDirective = ($rootscope, $rs) ->
Edit
-
+
<%= data %>
diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 8f3b310a..c504e9fc 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -94,15 +94,6 @@ } .us-content { - ul { - margin-left: 1rem; - } - li { - list-style-type: disc; - } - a { - color: $green-taiga; - } textarea { background: $white; height: 10rem;