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

diff --cc resources/js/services/code.js
index ca66bdb5a8a43337e25f272a761bc10823885851,4ab25aeb7dcbef45f71c1c3e683c66df90daac11..61aac7dc5b4909e9c56a13069fe59287fee2a6d5
--- 1/resources/js/services/code.js
--- 2/resources/assets/js/services/code.js
+++ b/resources/js/services/code.js
@@@ -250,17 -256,10 +252,17 @@@ function markdownEditor(elem) 
          value: content,
          mode: "markdown",
          lineNumbers: true,
-         theme: getTheme(),
          lineWrapping: true,
+         theme: getTheme(),
          scrollPastEnd: true,
 -    });
 +    };
 +
 +    window.$events.emitPublic(elem, 'editor-markdown-cm::pre-init', {config});
 +
 +    return CodeMirror(function (elt) {
 +        elem.parentNode.insertBefore(elt, elem);
 +        elem.style.display = 'none';
 +    }, config);
  }
  
  /**

diff --cc resources/sass/_text.scss
Simple merge