webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-11-03 02:13:16 +03:00
Code 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
parent 3959841dbc c14611d14b
commit e91ef54cc9
2 changed files with 6 additions and 5 deletions
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, value: content,
mode: mode, mode: mode,
lineNumbers: true, lineNumbers: true,
lineWrapping: true,
theme: getTheme(), theme: getTheme(),
readOnly: true readOnly: true
}); });
@@ -188,6 +189,7 @@ function wysiwygView(elem) {
value: content, value: content,
mode: getMode(lang), mode: getMode(lang),
lineNumbers: true, lineNumbers: true,
lineWrapping: true,
theme: getTheme(), theme: getTheme(),
readOnly: true readOnly: true
}); });
@@ -213,8 +215,8 @@ function popupEditor(elem, modeSuggestion) {
value: content, value: content,
mode: getMode(modeSuggestion), mode: getMode(modeSuggestion),
lineNumbers: true, lineNumbers: true,
theme: getTheme(), lineWrapping: true,
lineWrapping: true theme: getTheme()
}); });
} }
@@ -250,8 +252,8 @@ function markdownEditor(elem) {
value: content, value: content,
mode: "markdown", mode: "markdown",
lineNumbers: true, lineNumbers: true,
theme: getTheme(),
lineWrapping: true, lineWrapping: true,
theme: getTheme(),
scrollPastEnd: true, scrollPastEnd: true,
}; };

3
resources/sass/_text.scss
View File

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