mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7280 from nextcloud/fix-working-icon-position-when-sending-or-deleting-a-comment 

Fix working icon position when sending or deleting a comment
This commit is contained in:
Morris Jobke 2017-11-27 12:19:21 +01:00 committed by GitHub
parent c5446ebd9a 9bb2bb7870
commit 7bb42438fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/comments/css/comments.css
View File

@ -42,6 +42,20 @@
#commentsTabView .newCommentForm .submitLoading {
background-position: left;
/* Match rules for '#commentsTabView .newCommentForm .submit' to place the
loading icon at the same position as the confirm icon */
position: absolute;
bottom: 0px;
right: 8px;
width: 30px;
margin: 0;
padding: 7px 9px;
/* Match rules for 'input[type="submit"]' to place the loading icon at the
same position as the confirm icon */
min-height: 34px;
box-sizing: border-box;
}
#commentsTabView .newCommentForm .cancel {
@ -168,7 +182,8 @@
opacity: 1;
}
#commentsTabView .comment .action.delete {
#commentsTabView .comment .action.delete,
#commentsTabView .comment .deleteLoading {
position: absolute;
right: 0;
}

3
apps/comments/js/commentstabview.js
View File

@ -27,6 +27,7 @@
' <div class="author">{{actorDisplayName}}</div>' +
'{{#if isEditMode}}' +
' <a href="#" class="action delete icon icon-delete has-tooltip" title="{{deleteTooltip}}"></a>' +
' <div class="deleteLoading icon-loading-small hidden"></div>'+
'{{/if}}' +
' </div>' +
' <form class="newCommentForm">' +
@ -543,7 +544,7 @@
ev.preventDefault();
var $comment = $(ev.target).closest('.comment');
var commentId = $comment.data('id');
var $loading = $comment.find('.submitLoading');
var $loading = $comment.find('.deleteLoading');
var $commentField = $comment.find('.message');
var $submit = $comment.find('.submit');
var $cancel = $comment.find('.cancel');