Merge remote-tracking branch 'upstream/master'

css/print/pdf.css

@@ -71,6 +71,11 @@ a:visited {
 	text-decoration: underline;
 }
 
+.reveal pre code {
+	overflow: hidden !important;
+	font-family: monospace !important;
+}
+
 
 /* SECTION 6: more reveal.js specific additions by @skypanther */
 ul, ol, div, p {
@@ -127,7 +132,7 @@ ul, ol, div, p {
 	left: 0 !important;
 	top: 0 !important;
 	margin: 0 !important;
-	padding: 2cm 1cm 0 1cm !important;
+	padding: 2cm 2cm 0 2cm !important;
 	box-sizing: border-box !important;
 
 	opacity: 1 !important;
@@ -149,6 +154,10 @@ ul, ol, div, p {
 	height: auto !important;
 	min-height: auto !important;
 }
+.reveal .absolute-element {
+	margin-left: 2.2cm;
+	margin-top: 1.8cm;
+}
 .reveal section .fragment {
 	opacity: 1 !important;
 	visibility: visible !important;

css/reveal.css

@@ -78,6 +78,7 @@ body {
 	        hyphens: auto;
 
 	word-wrap: break-word;
+	line-height: 1;
 }
 
 .reveal h1 { font-size: 3.77em; }

js/reveal.js

@@ -272,6 +272,7 @@ var Reveal = (function(){
 			var data = {
 				background: slide.getAttribute( 'data-background' ),
 				backgroundSize: slide.getAttribute( 'data-background-size' ),
+				backgroundImage: slide.getAttribute( 'data-background-image' ),
 				backgroundColor: slide.getAttribute( 'data-background-color' ),
 				backgroundRepeat: slide.getAttribute( 'data-background-repeat' ),
 				backgroundPosition: slide.getAttribute( 'data-background-position' ),
@@ -293,6 +294,7 @@ var Reveal = (function(){
 
 			// Additional and optional background properties
 			if( data.backgroundSize ) element.style.backgroundSize = data.backgroundSize;
+			if( data.backgroundImage ) element.style.backgroundImage = 'url("' + data.backgroundImage + '")';
 			if( data.backgroundColor ) element.style.backgroundColor = data.backgroundColor;
 			if( data.backgroundRepeat ) element.style.backgroundRepeat = data.backgroundRepeat;
 			if( data.backgroundPosition ) element.style.backgroundPosition = data.backgroundPosition;

test/background.html

@@ -65,7 +65,7 @@
 				<section data-background="#888888">
 					<h2>Same background twice (2/2)</h2>
 				</section>
-				
+
 			</div>
 
 		</div>