summaryrefslogtreecommitdiff
path: root/public/js/index.js
diff options
context:
space:
mode:
authorMax Wu2016-11-03 14:17:10 +0800
committerGitHub2016-11-03 14:17:10 +0800
commit11faadb6842cacce7572526f533cb9351fc5f562 (patch)
treef466289e42547a163058a29f4e573061b3fb8abf /public/js/index.js
parent734d475c0e2dc467a657d350d8a37ec8aa800da7 (diff)
parent689b1dc4d6f438a6e58ee354d71ee4f2def11eae (diff)
Merge pull request #242 from Yukaii/webpack-stylesheet
Use webpack to bundle stylesheet
Diffstat (limited to 'public/js/index.js')
-rw-r--r--public/js/index.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/public/js/index.js b/public/js/index.js
index bb2a31f6..9c77ba8d 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1,6 +1,11 @@
/* jquery and jquery plugins */
require('../vendor/showup/showup');
+require('../css/index.css');
+require('../css/extra.css');
+require('../css/slide-preview.css');
+require('../css/site.css');
+
var toMarkdown = require('to-markdown');
var saveAs = require('file-saver').saveAs;
@@ -2306,7 +2311,7 @@ socket.on('delete', function () {
saveHistory(newnotehistory);
location.href = serverurl;
});
- }
+ }
});
var retryTimer = null;
socket.on('maintenance', function () {