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

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>
This commit is contained in:
Daniel Calviño Sánchez 2017-11-28 02:04:28 +01:00
parent 7d9e475434
commit 0c45778219
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/comments/css/comments.css
View File

@ -140,6 +140,9 @@
.atwho-view-ul * .avatar-name-wrapper, .atwho-view-ul * .avatar-name-wrapper,
#commentsTabView .comment .authorRow { #commentsTabView .comment .authorRow {
position: relative; position: relative;
display: inline-flex;
align-items: center;
width: 100%;
} }
#commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser), #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,
.atwho-view-ul .avatar-name-wrapper .avatar { .atwho-view-ul .avatar-name-wrapper .avatar {
cursor: pointer; cursor: pointer;
display: inline-flex;
align-items: center;
width: 100%;
} }
#commentsTabView .comments li .message .atwho-inserted { #commentsTabView .comments li .message .atwho-inserted {