FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation

This commit is contained in:
nilsding 2014-12-27 15:50:59 +01:00
parent 5c5edbab13 edeff57293
commit 1a131d8c47
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/stylesheets/scss/comments.scss
View File

@ -13,4 +13,12 @@
.comments--count { .comments--count {
z-index: 0; z-index: 0;
margin-top: -2em; margin-top: -2em;
}
.comments--body {
overflow: visible;
}
.comments--content {
overflow: hidden;
} }

4
app/views/shared/_comments.html.haml
View File

@ -7,7 +7,7 @@
.media .media
.pull-left .pull-left
%img.img-rounded.answerbox--img{src: gravatar_url(comment.user)} %img.img-rounded.answerbox--img{src: gravatar_url(comment.user)}
.media-body .media-body.comments--body
%h6.media-heading.answerbox--question-user= user_screen_name comment.user %h6.media-heading.answerbox--question-user= user_screen_name comment.user
- if user_signed_in? - if user_signed_in?
.pull-right .pull-right
@ -24,7 +24,7 @@
%a{href: '#', name: 'ab-report', data: { a_id: comment.id }} %a{href: '#', name: 'ab-report', data: { a_id: comment.id }}
%i.fa.fa-exclamation-triangle %i.fa.fa-exclamation-triangle
Report Report
%p= comment.content %p.comments--content= comment.content
- if user_signed_in? - if user_signed_in?
.form-group.has-feedback{name: 'ab-comment-new-group', 'data-a-id' => a.id} .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 }} %input.form-control.comments--box{type: :text, placeholder: 'Comment...', name: 'ab-comment-new', data: {a_id: a.id }}