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

Merge pull request #7316 from nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251 

Fix silent conflicts due to merging #7256 after #7251
This commit is contained in:
Roeland Jago Douma 2017-11-29 15:38:24 +01:00 committed by GitHub
parent 6097b74970 0c45778219
commit f03aa0480a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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,
#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 {