diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2017-11-28 02:04:28 +0100 |
|---|---|---|
| committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2017-11-28 02:35:39 +0100 |
| commit | 0c457782199ea04eb9977c3baaebc843b0099e9a (patch) | |
| tree | ec875e737f030017109f5b0b0e3a74298ee3a386 /apps/comments | |
| parent | 7d9e47543482acd430a18b482cd61bdd5eecc3e9 (diff) | |
| download | nextcloud-server-0c457782199ea04eb9977c3baaebc843b0099e9a.tar.gz nextcloud-server-0c457782199ea04eb9977c3baaebc843b0099e9a.zip | |
Fix silent conflicts due to merging #7256 after #7251
Although #7256 was merged cleanly some of the changes really conflicted
with those introduced by the last commit of #7251, and this broke the
appearance of the author row of comments. This commit fixes those silent
conflicts and restores the appearance of the author row.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
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 { |