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

Merge pull request #13802 from nextcloud/bugfix/noid/long-comment-dark-theme 

Fix long comment in dark theme
This commit is contained in:
Jan-Christoph Borchardt 2019-01-24 21:36:39 +01:00 committed by GitHub
parent b4bc36128d ec12353f47
commit 2987d30114
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/comments/css/comments.scss
View File

@ -65,7 +65,7 @@
#commentsTabView .comment {
position: relative;
/** padding bottom is little more so that the top and bottom gap look uniform **/
padding: 10px 0px 15px;
padding: 10px 0 15px;
}
#commentsTabView .comments .comment {
@ -112,11 +112,11 @@
left: 0;
right: 0;
bottom: 0;
background: -moz-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
background: -webkit-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
background: -o-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
background: -ms-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
background: linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
background: -moz-linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
background: -webkit-linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
background: -o-linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
background: -ms-linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
background: linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
background-repeat: no-repeat;
}

2
apps/comments/lib/Activity/Provider.php
View File

@ -204,7 +204,7 @@ class Provider implements IProvider {
try {
$comment = $this->commentsManager->get((string) $commentId);
$message = $comment->getMessage();
$message = str_replace("\n", '<br />', str_replace(['<', '>'], ['&lt;', '&gt;'], $message));
$message = str_replace(['<', '>', "\n"], ['&lt;', '&gt;', '<br />'], $message);
$mentionCount = 1;
$mentions = [];