From: Dan Brown <redacted>
Date: Sat, 15 Feb 2020 14:24:55 +0000 (+0000)
Subject: Removed unintended extra lines in code blocks
X-Git-Tag: v0.28.1~1^2~9
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/e8cfb4f2bed8c786da9ceccbe1599c33e23a6565

Removed unintended extra lines in code blocks

Fixes #1877
---

diff --git a/resources/js/services/code.js b/resources/js/services/code.js
index 718ef5721..a8cede5f4 100644
--- a/resources/js/services/code.js
+++ b/resources/js/services/code.js
@@ -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) {
diff --git a/resources/sass/_text.scss b/resources/sass/_text.scss
index 77e0773eb..d28706781 100644
--- a/resources/sass/_text.scss
+++ b/resources/sass/_text.scss
@@ -238,7 +238,6 @@ code {
   padding: 1px 3px;
   white-space:pre-wrap;
   line-height: 1.2em;
-  margin-bottom: 1.2em;
 }
 
 span.code {