summaryrefslogtreecommitdiffstats
path: root/Gruntfile.js
diff options
context:
space:
mode:
authorShaform <shaform@gmail.com>2014-06-17 22:08:46 +0800
committerShaform <shaform@gmail.com>2014-06-17 22:08:46 +0800
commit6bbefad24e6aa4a5b51b4b21bdf30b73f8cb4d41 (patch)
treed2efbbb62f9746b19b683c11a302c9afe385a2be /Gruntfile.js
parent1f4cf33dd08b439cadb5c649654ecd6d3f4b399d (diff)
parentd6eb8e4c6042262408c3c0b8d67bccecfa4bf882 (diff)
downloadgitbook-6bbefad24e6aa4a5b51b4b21bdf30b73f8cb4d41.zip
gitbook-6bbefad24e6aa4a5b51b4b21bdf30b73f8cb4d41.tar.gz
gitbook-6bbefad24e6aa4a5b51b4b21bdf30b73f8cb4d41.tar.bz2
Merge remote-tracking branch 'upstream/master' into ref_links
Diffstat (limited to 'Gruntfile.js')
-rw-r--r--Gruntfile.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 5e8e1d3..06e3f78 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -24,8 +24,8 @@ module.exports = function (grunt) {
optimization: 2
},
files: {
- "theme/assets/style.css": "theme/stylesheets/main.less",
- "theme/assets/print.css": "theme/stylesheets/print.less"
+ "theme/assets/style.css": "theme/stylesheets/website.less",
+ "theme/assets/print.css": "theme/stylesheets/ebook.less"
}
}
},
@@ -44,7 +44,8 @@ module.exports = function (grunt) {
"requireLib": 'vendors/requirejs/require',
"Mousetrap": 'vendors/mousetrap/mousetrap',
"lunr": 'vendors/lunr.js/lunr',
- "URI": 'vendors/URIjs/src/URI'
+ "URI": 'vendors/URIjs/src/URI',
+ "ace": 'vendors/ace-builds/src-noconflict/'
},
shim: {
'jQuery': {