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

diff --git a/resources/js/services/code.js b/resources/js/services/code.js
index ca66bdb5a8a43337e25f272a761bc10823885851..61aac7dc5b4909e9c56a13069fe59287fee2a6d5 100644 (file)
--- a/resources/js/services/code.js
+++ b/resources/js/services/code.js
@@ -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,
     };
 

diff --git a/resources/sass/_text.scss b/resources/sass/_text.scss
index 315f08c34b77261ce18ab6c1c7560441f8788dfb..cf78c162b95c72fc66e9643982bbc4c5aec90ec3 100644 (file)
--- a/resources/sass/_text.scss
+++ b/resources/sass/_text.scss
@@ -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;
 }
-