Skip to content
Snippets Groups Projects
Unverified Commit f03aa048 authored by Roeland Jago Douma's avatar Roeland Jago Douma Committed by GitHub
Browse files

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

Fix silent conflicts due to merging #7256 after #7251
parents 6097b749 0c457782
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/comments/css/comments.css
+ 3
− 3
View file @ f03aa048
...@@ -140,6 +140,9 @@ ...@@ -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 @@ ...@@ -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 {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment