Merge branch 'master' into bug/image-upload

[bookstack] / resources / assets / js / index.js

diff --git a/resources/assets/js/index.js b/resources/assets/js/index.js
index 1e060a77287e8cd526a20f968ac81d830e000a11..6022cd0a52eaf812a461c7a61e96a412c685e2e4 100644 (file)
--- a/resources/assets/js/index.js
+++ b/resources/assets/js/index.js
@@ -1,9 +1,9 @@
-import "../sass/styles.scss"
-import "../sass/print-styles.scss"
-import "../sass/export-styles.scss"
-
 import "babel-polyfill"
 import "./dom-polyfills"
+
+import jQuery from "jquery"
+window.jQuery = window.$ = jQuery;
+
 import "./pages/page-show"
 import Translations from "./translations"
 import vues from "./vues/vues"
@@ -125,8 +125,6 @@ jQuery.expr[":"].contains = $.expr.createPseudo(function (arg) {
     };
 });
 
-console.log('test');
-
 // Detect IE for css
 if(navigator.userAgent.indexOf('MSIE')!==-1
     || navigator.appVersion.indexOf('Trident/') > 0