From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 13 Sep 2016 13:24:04 +0000 (+0200)
Subject: <p> are now rendered as single lines w/o margin
X-Git-Tag: 3.0.0_Beta_1~188
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6b61417bc846ec99e79f9361ed322b27bb0356a8;p=GitHub%2FWoltLab%2FWCF.git

<p> are now rendered as single lines w/o margin

This change simulates the typical behavior of editors creating a simple
<br> on return, but actually uses <p> for the time being.
---

diff --git a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeProcessor.class.php b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeProcessor.class.php
index daac80b52a..e8786dad99 100644
--- a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeProcessor.class.php
+++ b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeProcessor.class.php
@@ -105,10 +105,10 @@ class HtmlOutputNodeProcessor extends AbstractHtmlNodeProcessor {
 						}
 					}
 					
-					for ($i = 0; $i < 2; $i++) {
+					//for ($i = 0; $i < 2; $i++) {
 						$br = $this->getDocument()->createElement('br');
 						$paragraph->appendChild($br);
-					}
+					//}
 				}
 				
 				DOMUtil::removeNode($paragraph, true);
diff --git a/wcfsetup/install/files/style/layout/global.scss b/wcfsetup/install/files/style/layout/global.scss
index de504a8d29..259148d00c 100644
--- a/wcfsetup/install/files/style/layout/global.scss
+++ b/wcfsetup/install/files/style/layout/global.scss
@@ -105,7 +105,8 @@ ol.nativeList {
 	}
 	
 	p {
-		margin: 1em 0;
+		//margin: 1em 0;
+		margin: 0;
 	}
 	
 	h1 {