diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-11-29 15:38:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-29 15:38:24 +0100 |
| commit | f03aa0480abe3c7c8bd207b7e08e750d18fdb2ba (patch) | |
| tree | 01242dce6082861a54fcb652daf632e29e35f3d5 /apps/comments | |
| parent | 6097b74970b6a9cb87d79f0c9fd3aba01cd49aa7 (diff) | |
| parent | 0c457782199ea04eb9977c3baaebc843b0099e9a (diff) | |
| download | nextcloud-server-f03aa0480abe3c7c8bd207b7e08e750d18fdb2ba.tar.gz nextcloud-server-f03aa0480abe3c7c8bd207b7e08e750d18fdb2ba.zip | |
Merge pull request #7316 from nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251
Fix silent conflicts due to merging #7256 after #7251
Diffstat (limited to 'apps/comments')
| -rw-r--r-- | apps/comments/css/comments.css | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/comments/css/comments.css b/apps/comments/css/comments.css index 646f5f1100c..311eeebe4db 100644 --- a/apps/comments/css/comments.css +++ b/apps/comments/css/comments.css @@ -140,6 +140,9 @@ .atwho-view-ul * .avatar-name-wrapper, #commentsTabView .comment .authorRow { position: relative; + display: inline-flex; + align-items: center; + width: 100%; } #commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser), @@ -152,9 +155,6 @@ .atwho-view-ul .avatar-name-wrapper, .atwho-view-ul .avatar-name-wrapper .avatar { cursor: pointer; - display: inline-flex; - align-items: center; - width: 100%; } #commentsTabView .comments li .message .atwho-inserted { |