summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2015-06-02 10:23:31 +0200
committerSamy Pessé <samypesse@gmail.com>2015-06-02 10:23:31 +0200
commit52e10b7cfe9c79eb3b8d2a6a5d9540f46d6914df (patch)
tree206083b7aa2a4285e0c059dc4fab4449c0607930 /lib
parentaddac85696aa836f504993b5536b3ecbf7c124c5 (diff)
downloadgitbook-52e10b7cfe9c79eb3b8d2a6a5d9540f46d6914df.zip
gitbook-52e10b7cfe9c79eb3b8d2a6a5d9540f46d6914df.tar.gz
gitbook-52e10b7cfe9c79eb3b8d2a6a5d9540f46d6914df.tar.bz2
Remove default print.css when styles/print.css is present
Diffstat (limited to 'lib')
-rw-r--r--lib/configuration.js1
-rw-r--r--lib/generators/ebook.js2
-rw-r--r--lib/generators/website.js3
3 files changed, 4 insertions, 2 deletions
diff --git a/lib/configuration.js b/lib/configuration.js
index d206505..29776bd 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -186,6 +186,7 @@ Configuration.DEFAULT = {
// CSS Styles
"styles": {
"website": "styles/website.css",
+ "print": "styles/print.css",
"ebook": "styles/ebook.css",
"pdf": "styles/pdf.css",
"mobi": "styles/mobi.css",
diff --git a/lib/generators/ebook.js b/lib/generators/ebook.js
index 0bad35a..cff9ef6 100644
--- a/lib/generators/ebook.js
+++ b/lib/generators/ebook.js
@@ -18,7 +18,7 @@ var Generator = function(book, format) {
this.namespace = "ebook";
// Styles to use
- this.styles = _.compact(["ebook", this.ebookFormat]);
+ this.styles = _.compact(["print", "ebook", this.ebookFormat]);
// Convert images (svg -> png)
this.convertImages = true;
diff --git a/lib/generators/website.js b/lib/generators/website.js
index 8d1a3c5..a671ca7 100644
--- a/lib/generators/website.js
+++ b/lib/generators/website.js
@@ -51,11 +51,12 @@ Generator.prototype.prepareStyles = function() {
.map(function(style) {
var stylePath = that.options.styles[style];
if (fs.existsSync(path.resolve(that.book.root, stylePath))) {
- return stylePath;
+ return [style, stylePath];
}
return null;
})
.compact()
+ .object()
.value();
return Q();