luisgulo/BookStack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix-1575' of git://github.com/james-geiger/BookStack into james-geiger-fix-1575

Browse source
This commit is contained in:
Dan Brown 2019-10-17 14:32:39 +01:00
commit e91ef54cc9
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/js/services/code.js
View file

@ -102,6 +102,7 @@ function highlightElem(elem) {
value: content,
mode: mode,
lineNumbers: true,
lineWrapping: true,
theme: getTheme(),
readOnly: true
});
@ -188,6 +189,7 @@ function wysiwygView(elem) {
value: content,
mode: getMode(lang),
lineNumbers: true,
lineWrapping: true,
theme: getTheme(),
readOnly: true
});
@ -213,8 +215,8 @@ function popupEditor(elem, modeSuggestion) {
value: content,
mode: getMode(modeSuggestion),
lineNumbers: true,
theme: getTheme(),
lineWrapping: true
lineWrapping: true,
theme: getTheme()
});
}
@ -250,8 +252,8 @@ function markdownEditor(elem) {
value: content,
mode: "markdown",
lineNumbers: true,
theme: getTheme(),
lineWrapping: true,
theme: getTheme(),
scrollPastEnd: true,
};

3
resources/sass/_text.scss
View file

@ -224,7 +224,7 @@ code {
@extend .code-base;
display: inline;
padding: 1px 3px;
white-space:pre;
white-space:pre-wrap;
line-height: 1.2em;
margin-bottom: 1.2em;
}
@ -369,4 +369,3 @@ span.sep {
margin-right: $-xs;
pointer-events: none;
}