Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
ad086b897e
|
@ -71,6 +71,11 @@ a:visited {
|
||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.reveal pre code {
|
||||||
|
overflow: hidden !important;
|
||||||
|
font-family: monospace !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* SECTION 6: more reveal.js specific additions by @skypanther */
|
/* SECTION 6: more reveal.js specific additions by @skypanther */
|
||||||
ul, ol, div, p {
|
ul, ol, div, p {
|
||||||
|
@ -127,7 +132,7 @@ ul, ol, div, p {
|
||||||
left: 0 !important;
|
left: 0 !important;
|
||||||
top: 0 !important;
|
top: 0 !important;
|
||||||
margin: 0 !important;
|
margin: 0 !important;
|
||||||
padding: 2cm 1cm 0 1cm !important;
|
padding: 2cm 2cm 0 2cm !important;
|
||||||
box-sizing: border-box !important;
|
box-sizing: border-box !important;
|
||||||
|
|
||||||
opacity: 1 !important;
|
opacity: 1 !important;
|
||||||
|
@ -149,6 +154,10 @@ ul, ol, div, p {
|
||||||
height: auto !important;
|
height: auto !important;
|
||||||
min-height: auto !important;
|
min-height: auto !important;
|
||||||
}
|
}
|
||||||
|
.reveal .absolute-element {
|
||||||
|
margin-left: 2.2cm;
|
||||||
|
margin-top: 1.8cm;
|
||||||
|
}
|
||||||
.reveal section .fragment {
|
.reveal section .fragment {
|
||||||
opacity: 1 !important;
|
opacity: 1 !important;
|
||||||
visibility: visible !important;
|
visibility: visible !important;
|
||||||
|
|
|
@ -78,6 +78,7 @@ body {
|
||||||
hyphens: auto;
|
hyphens: auto;
|
||||||
|
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
|
line-height: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.reveal h1 { font-size: 3.77em; }
|
.reveal h1 { font-size: 3.77em; }
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -272,6 +272,7 @@ var Reveal = (function(){
|
||||||
var data = {
|
var data = {
|
||||||
background: slide.getAttribute( 'data-background' ),
|
background: slide.getAttribute( 'data-background' ),
|
||||||
backgroundSize: slide.getAttribute( 'data-background-size' ),
|
backgroundSize: slide.getAttribute( 'data-background-size' ),
|
||||||
|
backgroundImage: slide.getAttribute( 'data-background-image' ),
|
||||||
backgroundColor: slide.getAttribute( 'data-background-color' ),
|
backgroundColor: slide.getAttribute( 'data-background-color' ),
|
||||||
backgroundRepeat: slide.getAttribute( 'data-background-repeat' ),
|
backgroundRepeat: slide.getAttribute( 'data-background-repeat' ),
|
||||||
backgroundPosition: slide.getAttribute( 'data-background-position' ),
|
backgroundPosition: slide.getAttribute( 'data-background-position' ),
|
||||||
|
@ -293,6 +294,7 @@ var Reveal = (function(){
|
||||||
|
|
||||||
// Additional and optional background properties
|
// Additional and optional background properties
|
||||||
if( data.backgroundSize ) element.style.backgroundSize = data.backgroundSize;
|
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.backgroundColor ) element.style.backgroundColor = data.backgroundColor;
|
||||||
if( data.backgroundRepeat ) element.style.backgroundRepeat = data.backgroundRepeat;
|
if( data.backgroundRepeat ) element.style.backgroundRepeat = data.backgroundRepeat;
|
||||||
if( data.backgroundPosition ) element.style.backgroundPosition = data.backgroundPosition;
|
if( data.backgroundPosition ) element.style.backgroundPosition = data.backgroundPosition;
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue