summaryrefslogtreecommitdiffstats
path: root/lib/configuration.js
diff options
context:
space:
mode:
authorSamy Pesse <samypesse@gmail.com>2015-10-03 20:24:56 +0200
committerSamy Pessé <samypesse@gmail.com>2015-10-06 09:47:04 +0200
commit33593c13ae4e7b4db62a56d76ffee48a2e5f5d5e (patch)
tree30d6a0feaac4cd93751c86f6b9fb87bb305b1d83 /lib/configuration.js
parenteef82c18c2959a09ea65a5440e007a82d1414ee3 (diff)
downloadgitbook-33593c13ae4e7b4db62a56d76ffee48a2e5f5d5e.zip
gitbook-33593c13ae4e7b4db62a56d76ffee48a2e5f5d5e.tar.gz
gitbook-33593c13ae4e7b4db62a56d76ffee48a2e5f5d5e.tar.bz2
Inline css for footer/header templates
Diffstat (limited to 'lib/configuration.js')
-rw-r--r--lib/configuration.js19
1 files changed, 2 insertions, 17 deletions
diff --git a/lib/configuration.js b/lib/configuration.js
index 563fcef..7488fae 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -277,7 +277,6 @@ Configuration.DEFAULT = {
// Margin (in pts)
// Note: 72 pts equals 1 inch
-<<<<<<< HEAD
'margin': {
'right': 62,
'left': 62,
@@ -286,24 +285,10 @@ Configuration.DEFAULT = {
},
// Header HTML template. Available variables: _PAGENUM_, _TITLE_, _AUTHOR_ and _SECTION_.
- 'headerTemplate': '',
+ 'headerTemplate': null,
// Footer HTML template. Available variables: _PAGENUM_, _TITLE_, _AUTHOR_ and _SECTION_.
- 'footerTemplate': ''
-=======
- "margin": {
- "right": 62,
- "left": 62,
- "top": 62,
- "bottom": 62
- },
-
- //Header HTML template. Available variables: _PAGENUM_, _TITLE_, _AUTHOR_ and _SECTION_.
- "headerTemplate": fs.readFileSync(path.resolve(__dirname, '../theme/templates/ebook/header.html'), { encoding: 'utf-8' }),
-
- //Footer HTML template. Available variables: _PAGENUM_, _TITLE_, _AUTHOR_ and _SECTION_.
- "footerTemplate": fs.readFileSync(path.resolve(__dirname, '../theme/templates/ebook/footer.html'), { encoding: 'utf-8' })
->>>>>>> Add css to footer/header for pdf
+ 'footerTemplate': null
}
};