taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix #728

stable
Juanfran 2014-08-20 12:19:54 +02:00
parent f59c7726c5
commit 1fae3c9e9a
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/modules/common.coffee
View File

@ -280,7 +280,7 @@ ChangeDirective = ->
avatar: getUserAvatar(comment.user.pk) avatar: getUserAvatar(comment.user.pk)
userFullName: getUserFullName(comment.user.pk) userFullName: getUserFullName(comment.user.pk)
creationDate: moment(comment.created_at).format("DD MMM YYYY HH:mm") creationDate: moment(comment.created_at).format("DD MMM YYYY HH:mm")
comment: taiga.nl2br(comment.comment_html) comment: comment.comment_html
changesText: buildChangesText(comment) changesText: buildChangesText(comment)
hasChanges: countChanges(comment) > 0 hasChanges: countChanges(comment) > 0
}) })

2
app/coffee/modules/common/wisiwyg.coffee
View File

@ -38,7 +38,7 @@ tgMarkitupDirective = ($rootscope, $rs) ->
<div class="actions"> <div class="actions">
<a href="#" title="Edit">Edit</a> <a href="#" title="Edit">Edit</a>
</div> </div>
<div class="content"> <div class="content wysiwyg">
<%= data %> <%= data %>
</div> </div>
</div> </div>

9
app/styles/layout/us-detail.scss
View File

@ -94,15 +94,6 @@
} }
.us-content { .us-content {
ul {
margin-left: 1rem;
}
li {
list-style-type: disc;
}
a {
color: $green-taiga;
}
textarea { textarea {
background: $white; background: $white;
height: 10rem; height: 10rem;