github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge mistake; adjust animation timings.

Browse source
This commit is contained in:
Paulo Reis 2017-01-12 11:56:04 +00:00
parent 88b694f894
commit 0b57cc650b
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/web/app/views/project/editor/review-panel.jade
View file

@ -183,11 +183,7 @@ script(type='text/ng-template', id='commentEntryTemplate')
placeholder="{{ 'Hit \"Enter\" to reply' + (entry.resolved ? ' and re-open' : '') }}"
)
.rp-entry-actions
<<<<<<< Updated upstream
a.rp-entry-button(href, ng-click="onResolve();", ng-if="permissions.comment && permissions.write")
=======
a.rp-entry-button(href, ng-click="animateAndCallOnResolve();")
>>>>>>> Stashed changes
a.rp-entry-button(href, ng-click="animateAndCallOnResolve();", ng-if="permissions.comment && permissions.write")
i.fa.fa-inbox
| &nbsp;Resolve
a.rp-entry-button(href, ng-click="onReply();", ng-if="permissions.comment")

2
services/web/public/coffee/ide/review-panel/directives/commentEntry.coffee
View file

@ -24,5 +24,5 @@ define [
scope.animateAndCallOnResolve = () ->
scope.state.animating = true
element.find(".rp-entry").css("top", 0)
$timeout((() -> scope.onResolve()), 200)
$timeout((() -> scope.onResolve()), 350)
return true

4
services/web/public/stylesheets/app/editor/review-panel.less
View file

@ -263,7 +263,7 @@
z-index: 3;
transform: scale(.1);
transform-origin: 0 0;
transition: top .2s ease-out, left .2s ease-out, transform .2s ease-out, opacity .2s ease-out .1s;
transition: top .35s ease-out, left .35s ease-out, transform .35s ease-out, opacity .35s ease-out .2s;
}
&-comment-resolved {
@ -516,7 +516,7 @@
}
.rp-comment-wrapper {
transition: .2s opacity ease-out;
transition: .35s opacity ease-out .2s;
&-resolving {
opacity: 0;