Merge branch 'master' of github.com:hakimel/reveal.js into dev
						commit
						fcb4b05de7
					
				|  | @ -13,7 +13,7 @@ module.exports = function(grunt) { | |||
| 				' * http://lab.hakim.se/reveal-js\n' + | ||||
| 				' * MIT licensed\n' + | ||||
| 				' *\n' + | ||||
| 				' * Copyright (C) 2015 Hakim El Hattab, http://hakim.se\n' + | ||||
| 				' * Copyright (C) 2016 Hakim El Hattab, http://hakim.se\n' + | ||||
| 				' */' | ||||
| 		}, | ||||
| 
 | ||||
|  |  | |||
							
								
								
									
										2
									
								
								LICENSE
								
								
								
								
							
							
						
						
									
										2
									
								
								LICENSE
								
								
								
								
							|  | @ -1,4 +1,4 @@ | |||
| Copyright (C) 2015 Hakim El Hattab, http://hakim.se | ||||
| Copyright (C) 2016 Hakim El Hattab, http://hakim.se | ||||
| 
 | ||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
| of this software and associated documentation files (the "Software"), to deal | ||||
|  |  | |||
|  | @ -1021,4 +1021,4 @@ Some reveal.js features, like external Markdown and speaker notes, require that | |||
| 
 | ||||
| MIT licensed | ||||
| 
 | ||||
| Copyright (C) 2015 Hakim El Hattab, http://hakim.se | ||||
| Copyright (C) 2016 Hakim El Hattab, http://hakim.se | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ | |||
|  * http://lab.hakim.se/reveal-js | ||||
|  * MIT licensed | ||||
|  * | ||||
|  * Copyright (C) 2015 Hakim El Hattab, http://hakim.se | ||||
|  * Copyright (C) 2016 Hakim El Hattab, http://hakim.se | ||||
|  */ | ||||
| /********************************************* | ||||
|  * RESET STYLES | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ | |||
|  * http://lab.hakim.se/reveal-js | ||||
|  * MIT licensed | ||||
|  * | ||||
|  * Copyright (C) 2015 Hakim El Hattab, http://hakim.se | ||||
|  * Copyright (C) 2016 Hakim El Hattab, http://hakim.se | ||||
|  */ | ||||
| 
 | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| /** | ||||
|  * Black theme for reveal.js. This is the opposite of the 'white' theme. | ||||
|  * | ||||
|  * Copyright (C) 2015 Hakim El Hattab, http://hakim.se | ||||
|  * By Hakim El Hattab, http://hakim.se | ||||
|  */ | ||||
| @import url(../../lib/font/source-sans-pro/source-sans-pro.css); | ||||
| section.has-light-background, section.has-light-background h1, section.has-light-background h2, section.has-light-background h3, section.has-light-background h4, section.has-light-background h5, section.has-light-background h6 { | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| /** | ||||
|  * Black theme for reveal.js. This is the opposite of the 'white' theme. | ||||
|  * | ||||
|  * Copyright (C) 2015 Hakim El Hattab, http://hakim.se | ||||
|  * By Hakim El Hattab, http://hakim.se | ||||
|  */ | ||||
| 
 | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| /** | ||||
|  * White theme for reveal.js. This is the opposite of the 'black' theme. | ||||
|  * | ||||
|  * Copyright (C) 2015 Hakim El Hattab, http://hakim.se | ||||
|  * By Hakim El Hattab, http://hakim.se | ||||
|  */ | ||||
| 
 | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| /** | ||||
|  * White theme for reveal.js. This is the opposite of the 'black' theme. | ||||
|  * | ||||
|  * Copyright (C) 2015 Hakim El Hattab, http://hakim.se | ||||
|  * By Hakim El Hattab, http://hakim.se | ||||
|  */ | ||||
| @import url(../../lib/font/source-sans-pro/source-sans-pro.css); | ||||
| section.has-dark-background, section.has-dark-background h1, section.has-dark-background h2, section.has-dark-background h3, section.has-dark-background h4, section.has-dark-background h5, section.has-dark-background h6 { | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ | |||
|  * http://lab.hakim.se/reveal-js
 | ||||
|  * MIT licensed | ||||
|  * | ||||
|  * Copyright (C) 2015 Hakim El Hattab, http://hakim.se
 | ||||
|  * Copyright (C) 2016 Hakim El Hattab, http://hakim.se
 | ||||
|  */ | ||||
| (function( root, factory ) { | ||||
| 	if( typeof define === 'function' && define.amd ) { | ||||
|  |  | |||
|  | @ -40,6 +40,5 @@ | |||
|     "grunt": "~0.4.5", | ||||
|     "node-sass": "~3.3.3" | ||||
|   }, | ||||
|    | ||||
|   "license": "MIT" | ||||
| } | ||||
|  |  | |||
|  | @ -40,7 +40,7 @@ console.log( 'Printing PDF (Paper size: '+ page.paperSize.width + 'x' + page.pap | |||
| 
 | ||||
| page.open( inputFile, function( status ) { | ||||
| 	window.setTimeout( function() { | ||||
| 		console.log( 'Printed succesfully' ); | ||||
| 		console.log( 'Printed successfully' ); | ||||
| 		page.render( outputFile ); | ||||
| 		phantom.exit(); | ||||
| 	}, 1000 ); | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Hakim El Hattab
						Hakim El Hattab