From 1ac006e0f2119452ecce1767b9992b2fbe618892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 14 Nov 2016 10:41:49 +0100 Subject: [PATCH] [26266] Restore newlines in paragraphs within description https://github.com/opf/openproject/commit/af430db688741f0c9704c3a1207de508f141543c#diff-4a5d02bdd648f4382bc7d0754cdb2851R73 introduced a margin-bottom of 0 for all paragraphs within an edit field. As paragraphs are used to split apart, well, paragraphs in the textile, this causes all linebreaks to collapse. --- .../content/work_packages/inplace_editing/_edit_fields.sass | 3 +++ .../xss/bindUnescapedHtml/bindUnescapedHtml.directive.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/content/work_packages/inplace_editing/_edit_fields.sass b/app/assets/stylesheets/content/work_packages/inplace_editing/_edit_fields.sass index df60f01192..2a72e8ae49 100644 --- a/app/assets/stylesheets/content/work_packages/inplace_editing/_edit_fields.sass +++ b/app/assets/stylesheets/content/work_packages/inplace_editing/_edit_fields.sass @@ -75,6 +75,9 @@ word-wrap: break-word margin-bottom: 0 + .read-value--html p + margin-bottom: 1em + .inplace-edit--read-value &:before vertical-align: middle diff --git a/frontend/app/components/common/xss/bindUnescapedHtml/bindUnescapedHtml.directive.ts b/frontend/app/components/common/xss/bindUnescapedHtml/bindUnescapedHtml.directive.ts index 4935962718..1b7df5d22a 100644 --- a/frontend/app/components/common/xss/bindUnescapedHtml/bindUnescapedHtml.directive.ts +++ b/frontend/app/components/common/xss/bindUnescapedHtml/bindUnescapedHtml.directive.ts @@ -42,7 +42,7 @@ function bindUnescapedHtml(ExpressionService:ExpressionService, $sce) { return { restrict: 'A', - template: '', + template: '', scope: { value: '=bindUnescapedHtml', },