]> BookStack Code Mirror - bookstack/commitdiff
Removed unintended extra lines in code blocks
authorDan Brown <redacted>
Sat, 15 Feb 2020 14:24:55 +0000 (14:24 +0000)
committerDan Brown <redacted>
Sat, 15 Feb 2020 14:24:55 +0000 (14:24 +0000)
Fixes #1877

resources/js/services/code.js
resources/sass/_text.scss

index 718ef5721c9cb3b02774794aa5f405c7cea4a9df..a8cede5f4447787c8721c071c4214a0add48883e 100644 (file)
@@ -111,7 +111,7 @@ function highlightWithin(parent) {
 function highlightElem(elem) {
     const innerCodeElem = elem.querySelector('code[class^=language-]');
     elem.innerHTML = elem.innerHTML.replace(/<br\s*[\/]?>/gi ,'\n');
-    const content = elem.textContent;
+    const content = elem.textContent.trimEnd();
 
     let mode = '';
     if (innerCodeElem !== null) {
index 77e0773eb6dbf7e18e6953cc1f00eb09344e3c9a..d28706781529317c9d53db9e7ce2a418bbb2a134 100644 (file)
@@ -238,7 +238,6 @@ code {
   padding: 1px 3px;
   white-space:pre-wrap;
   line-height: 1.2em;
-  margin-bottom: 1.2em;
 }
 
 span.code {