From 8e48140c86810eed889ee361c16c30f6467e756f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 24 Jan 2019 20:35:14 +0100 Subject: [PATCH 1/2] Fix linear-gradient for long comments on dark-theme Signed-off-by: Joas Schilling --- apps/comments/css/comments.scss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/comments/css/comments.scss b/apps/comments/css/comments.scss index e631d6891f..665051cf06 100644 --- a/apps/comments/css/comments.scss +++ b/apps/comments/css/comments.scss @@ -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; } From ec12353f47dade831d0d2d6a9a826caed4db38a0 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 24 Jan 2019 20:35:55 +0100 Subject: [PATCH 2/2] Merge the str_replacements Signed-off-by: Joas Schilling --- apps/comments/lib/Activity/Provider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/comments/lib/Activity/Provider.php b/apps/comments/lib/Activity/Provider.php index 4940bb6afe..719d4c8bb5 100644 --- a/apps/comments/lib/Activity/Provider.php +++ b/apps/comments/lib/Activity/Provider.php @@ -204,7 +204,7 @@ class Provider implements IProvider { try { $comment = $this->commentsManager->get((string) $commentId); $message = $comment->getMessage(); - $message = str_replace("\n", '
', str_replace(['<', '>'], ['<', '>'], $message)); + $message = str_replace(['<', '>', "\n"], ['<', '>', '
'], $message); $mentionCount = 1; $mentions = [];