diff options
| author | Chris Lawrence | 2013-06-21 17:57:09 -0400 |
|---|---|---|
| committer | Chris Lawrence | 2013-06-21 17:57:09 -0400 |
| commit | 7b119763f82fab69fd43c49f4af39481dd556cab (patch) | |
| tree | 3aa6b5bec29132c22afa552beb851c8f785daa16 /plugin | |
| parent | 636a6661978d04791bc899be65d7c3fd23eea125 (diff) | |
| parent | e51c0fc3ce3568eb325b87fe60ca7bdd07861150 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/multiplex/index.js | 1 | ||||
| -rw-r--r-- | plugin/notes-server/index.js | 1 | ||||
| -rw-r--r-- | plugin/notes-server/notes.html | 9 | ||||
| -rw-r--r-- | plugin/notes/notes.html | 7 | ||||
| -rw-r--r-- | plugin/print-pdf/print-pdf.js | 11 |
5 files changed, 20 insertions, 9 deletions
diff --git a/plugin/multiplex/index.js b/plugin/multiplex/index.js index 35df8e3..6f5d8b1 100644 --- a/plugin/multiplex/index.js +++ b/plugin/multiplex/index.js @@ -30,6 +30,7 @@ app.configure(function() { }); app.get("/", function(req, res) { + res.writeHead(200, {'Content-Type': 'text/html'}); fs.createReadStream(opts.baseDir + '/index.html').pipe(res); }); diff --git a/plugin/notes-server/index.js b/plugin/notes-server/index.js index 8643f5d..5535c90 100644 --- a/plugin/notes-server/index.js +++ b/plugin/notes-server/index.js @@ -30,6 +30,7 @@ app.configure(function() { }); app.get("/", function(req, res) { + res.writeHead(200, {'Content-Type': 'text/html'}); fs.createReadStream(opts.baseDir + '/index.html').pipe(res); }); diff --git a/plugin/notes-server/notes.html b/plugin/notes-server/notes.html index 551e400..25d1a62 100644 --- a/plugin/notes-server/notes.html +++ b/plugin/notes-server/notes.html @@ -3,6 +3,8 @@ <head> <meta charset="utf-8"> + <meta name="viewport" content="width=1150"> + <title>reveal.js - Slide Notes</title> <style> @@ -14,6 +16,7 @@ font-size: 24px; width: 640px; margin-top: 5px; + clear: left; } #wrap-current-slide { @@ -27,13 +30,13 @@ width: 1280px; height: 1024px; border: none; - + -webkit-transform-origin: 0 0; -moz-transform-origin: 0 0; -ms-transform-origin: 0 0; -o-transform-origin: 0 0; transform-origin: 0 0; - + -webkit-transform: scale(0.5); -moz-transform: scale(0.5); -ms-transform: scale(0.5); @@ -53,7 +56,7 @@ width: 1280px; height: 1024px; border: none; - + -webkit-transform-origin: 0 0; -moz-transform-origin: 0 0; -ms-transform-origin: 0 0; diff --git a/plugin/notes/notes.html b/plugin/notes/notes.html index 830045d..8af43fb 100644 --- a/plugin/notes/notes.html +++ b/plugin/notes/notes.html @@ -14,6 +14,7 @@ font-size: 24px; width: 640px; margin-top: 5px; + clear: left; } #wrap-current-slide { @@ -212,9 +213,9 @@ now = new Date(); diff = now.getTime() - start.getTime(); - hours = parseInt( diff / ( 1000 * 60 * 60 ) ); - minutes = parseInt( ( diff / ( 1000 * 60 ) ) % 60 ); - seconds = parseInt( ( diff / 1000 ) % 60 ); + hours = Math.floor( diff / ( 1000 * 60 * 60 ) ); + minutes = Math.floor( ( diff / ( 1000 * 60 ) ) % 60 ); + seconds = Math.floor( ( diff / 1000 ) % 60 ); clockEl.innerHTML = now.toLocaleTimeString(); hoursEl.innerHTML = zeroPadInteger( hours ); diff --git a/plugin/print-pdf/print-pdf.js b/plugin/print-pdf/print-pdf.js index 2b1d691..6b6cad6 100644 --- a/plugin/print-pdf/print-pdf.js +++ b/plugin/print-pdf/print-pdf.js @@ -11,8 +11,13 @@ var page = new WebPage(); var system = require( 'system' ); +page.viewportSize = { + width: 1024, + height: 768 +}; + page.paperSize = { - format: 'A4', + format: 'letter', orientation: 'landscape', margin: { left: '0', @@ -21,7 +26,6 @@ page.paperSize = { bottom: '0' } }; -page.zoomFactor = 1.5; var revealFile = system.args[1] || 'index.html?print-pdf'; var slideFile = system.args[2] || 'slides.pdf'; @@ -36,4 +40,5 @@ page.open( revealFile, function( status ) { console.log( 'Printed succesfully' ); page.render( slideFile ); phantom.exit(); -} );
\ No newline at end of file +} ); + |