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

Merge pull request #10288 from nextcloud/bugfix/noid/comments-mention-inline 

Fix inline avatar display for mentions in comments
This commit is contained in:
Morris Jobke 2018-07-19 10:35:34 +02:00 committed by GitHub
parent b7e32df660 9771b70c8f
commit cc14ec962b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/comments/css/comments.scss
View File

@ -155,8 +155,27 @@
cursor: pointer;
}
#commentsTabView .comments li .message .atwho-inserted {
margin-left: 5px;
#commentsTabView .comments li .message .atwho-inserted,
#commentsTabView .newCommentForm .atwho-inserted {
.avatar-name-wrapper {
display: inline;
vertical-align: top;
background-color: var(--color-background-dark);
border-radius: 50vh;
padding: 1px 7px 1px 1px;
.avatar {
img {
vertical-align: top;
}
height: 16px;
width: 16px;
vertical-align: middle;
padding: 1px;
margin-top: -3px;
margin-left: 0;
margin-right: 2px;
}
}
}
.atwho-view-ul * .avatar-name-wrapper {

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

@ -383,7 +383,11 @@
_postRenderItem: function($el, editionMode) {
$el.find('.has-tooltip').tooltip();
$el.find('.avatar').each(function() {
$el.find('.avatar').each(function () {
var $this = $(this);
$this.avatar($this.attr('data-username'), 16);
});
$el.find('.authorRow .avatar').each(function () {
var $this = $(this);
$this.avatar($this.attr('data-username'), 32);
});