github-mirror/BookStack
github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-03 09:34:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed unintended extra lines in code blocks

Browse Source 
Fixes #1877
This commit is contained in:
Dan Brown 2020-02-15 14:24:55 +00:00
parent 49386b42da
commit e8cfb4f2be
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/js/services/code.js
View File

@ -111,7 +111,7 @@ function highlightWithin(parent) {
function highlightElem(elem) { function highlightElem(elem) {
const innerCodeElem = elem.querySelector('code[class^=language-]'); const innerCodeElem = elem.querySelector('code[class^=language-]');
elem.innerHTML = elem.innerHTML.replace(/<br\s*[\/]?>/gi ,'\n'); elem.innerHTML = elem.innerHTML.replace(/<br\s*[\/]?>/gi ,'\n');
const content = elem.textContent; const content = elem.textContent.trimEnd();
let mode = ''; let mode = '';
if (innerCodeElem !== null) { if (innerCodeElem !== null) {

1
resources/sass/_text.scss
View File

@ -238,7 +238,6 @@ code {
padding: 1px 3px; padding: 1px 3px;
white-space:pre-wrap; white-space:pre-wrap;
line-height: 1.2em; line-height: 1.2em;
margin-bottom: 1.2em;
} }
span.code { span.code {