<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 daac80b52ae158a396f1de3a2f215edfc3257f81..e8786dad995d781099152fa52599b88fa8760833 100644 (file)
--- 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 de504a8d29ea5acc7e6686641c0b329983512ffc..259148d00c13d9869857485724fa6bd4d85d8984 100644 (file)
--- 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 {