From 0c457782199ea04eb9977c3baaebc843b0099e9a Mon Sep 17 00:00:00 2001 From: Daniel Calviño Sánchez Date: Tue, 28 Nov 2017 02:04:28 +0100 Subject: Fix silent conflicts due to merging #7256 after #7251 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- apps/comments/css/comments.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/comments/css') 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 { -- cgit v1.2.3