diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-07-18 20:28:02 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-07-18 20:28:02 +0200 |
| commit | 9771b70c8fdd31d0f54d7515f64b832b8836c57e (patch) | |
| tree | 2b1cd9d748a0e9ee12972bea3dc811023136e96c | |
| parent | ad9b458c7437e20be7d5a93ce383effe354bfeba (diff) | |
| download | nextcloud-server-9771b70c8fdd31d0f54d7515f64b832b8836c57e.tar.gz nextcloud-server-9771b70c8fdd31d0f54d7515f64b832b8836c57e.zip | |
Fix inline avatar display for mentions in comments
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | apps/comments/css/comments.scss | 23 | ||||
| -rw-r--r-- | apps/comments/js/commentstabview.js | 6 |
2 files changed, 26 insertions, 3 deletions
diff --git a/apps/comments/css/comments.scss b/apps/comments/css/comments.scss index ae1f6d71720..ffb6f04f533 100644 --- a/apps/comments/css/comments.scss +++ b/apps/comments/css/comments.scss @@ -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 { diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js index 9477cb0c301..fc074b709ad 100644 --- a/apps/comments/js/commentstabview.js +++ b/apps/comments/js/commentstabview.js @@ -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); }); |