alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes

Browse Source
This commit is contained in:
James Allen
2017-01-12 13:08:57 +01:00
parent 64b9fe52dd 0b57cc650b
commit 0d02b860d9
3 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/views/project/editor/review-panel.jade
+5 -3
View File
@@ -152,7 +152,9 @@ script(type='text/ng-template', id='changeEntryTemplate')
|  Accept
script(type='text/ng-template', id='commentEntryTemplate')
div
.rp-comment-wrapper(
ng-class="{ 'rp-comment-wrapper-resolving': state.animating }"
)
.rp-entry-callout.rp-entry-callout-comment
.rp-entry-indicator(
ng-class="{ 'rp-entry-indicator-focused': entry.focused }"
@@ -160,7 +162,7 @@ script(type='text/ng-template', id='commentEntryTemplate')
)
i.fa.fa-comment
.rp-entry.rp-entry-comment(
ng-class="{ 'rp-entry-focused': entry.focused }"
ng-class="{ 'rp-entry-focused': entry.focused, 'rp-entry-comment-resolving': state.animating }"
)
div
.rp-comment(
@@ -181,7 +183,7 @@ script(type='text/ng-template', id='commentEntryTemplate')
placeholder="{{ 'Hit \"Enter\" to reply' + (entry.resolved ? ' and re-open' : '') }}"
)
.rp-entry-actions
a.rp-entry-button(href, ng-click="onResolve();", ng-if="permissions.comment && permissions.write")
a.rp-entry-button(href, ng-click="animateAndCallOnResolve();", ng-if="permissions.comment && permissions.write")
i.fa.fa-inbox
|  Resolve
a.rp-entry-button(href, ng-click="onReply();", ng-if="permissions.comment")