Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation
This commit is contained in:
commit
f1298a416f
|
@ -17,7 +17,7 @@
|
||||||
%i.fa.fa-comments
|
%i.fa.fa-comments
|
||||||
%span{id: "ab-comment-count-#{a.id}"}= a.comment_count
|
%span{id: "ab-comment-count-#{a.id}"}= a.comment_count
|
||||||
- if user_signed_in?
|
- if user_signed_in?
|
||||||
.btn-group.dropdown
|
.btn-group
|
||||||
%button.btn.btn-default.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
|
%button.btn.btn-default.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
|
||||||
%span.caret
|
%span.caret
|
||||||
%ul.dropdown-menu.dropdown-menu-right{role: :menu}
|
%ul.dropdown-menu.dropdown-menu-right{role: :menu}
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
%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
|
||||||
%btn-group
|
%btn-group.dropdown
|
||||||
%button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
|
%button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
|
||||||
%span.caret
|
%span.caret
|
||||||
%ul.dropdown-menu.dropdown-menu-right{role: :menu}
|
%ul.dropdown-menu.dropdown-menu-right{role: :menu}
|
||||||
|
|
Loading…
Reference in New Issue