merge slide numbers, adjust code format

edit
Hakim El Hattab 2013-11-17 17:05:23 -05:00
commit bdb46060b3
12 changed files with 105 additions and 5 deletions

View File

@ -476,6 +476,22 @@ body {
transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
}
/*********************************************
* SLIDE NUMBER
*********************************************/
.reveal .slide-number {
position: fixed;
display: block;
opacity: 0.5;
z-index: 31;
width: 110px;
bottom: 30px;
left: 11px;
font-size: 12px;
text-align: center;
letter-spacing: 0px
}
/*********************************************
* SLIDES

2
css/reveal.min.css vendored

File diff suppressed because one or more lines are too long

View File

@ -127,6 +127,13 @@ body {
.reveal .controls div.navigate-down.enabled:hover {
border-top-color: #c0a86e; }
/*********************************************
* SLIDE NUMBER
*********************************************/
.reveal .slide-number {
color: #8b743d;
}
/*********************************************
* PROGRESS BAR
*********************************************/

View File

@ -127,6 +127,13 @@ body {
.reveal .controls div.navigate-down.enabled:hover {
border-top-color: #71e9f4; }
/*********************************************
* SLIDE NUMBER
*********************************************/
.reveal .slide-number {
color: #13daec;
}
/*********************************************
* PROGRESS BAR
*********************************************/

View File

@ -127,6 +127,13 @@ body {
.reveal .controls div.navigate-down.enabled:hover {
border-top-color: #78b9e6; }
/*********************************************
* SLIDE NUMBER
*********************************************/
.reveal .slide-number {
color: #268bd2;
}
/*********************************************
* PROGRESS BAR
*********************************************/

View File

@ -115,6 +115,13 @@ body {
.reveal .controls div.navigate-down.enabled:hover {
border-top-color: #f3d7ac; }
/*********************************************
* SLIDE NUMBER
*********************************************/
.reveal .slide-number {
color: #e7ad52;
}
/*********************************************
* PROGRESS BAR
*********************************************/

View File

@ -117,6 +117,13 @@ body {
.reveal .controls div.navigate-down.enabled:hover {
border-top-color: #8b7c69; }
/*********************************************
* SLIDE NUMBER
*********************************************/
.reveal .slide-number {
color: #51483d;
}
/*********************************************
* PROGRESS BAR
*********************************************/

View File

@ -117,6 +117,13 @@ body {
.reveal .controls div.navigate-down.enabled:hover {
border-top-color: #0000f1; }
/*********************************************
* SLIDE NUMBER
*********************************************/
.reveal .slide-number {
color: darkblue;
}
/*********************************************
* PROGRESS BAR
*********************************************/

View File

@ -124,6 +124,13 @@ body {
.reveal .controls div.navigate-down.enabled:hover {
border-top-color: #74a7cb; }
/*********************************************
* SLIDE NUMBER
*********************************************/
.reveal .slide-number {
color: #3b759e;
}
/*********************************************
* PROGRESS BAR
*********************************************/

View File

@ -127,6 +127,13 @@ body {
.reveal .controls div.navigate-down.enabled:hover {
border-top-color: #78b9e6; }
/*********************************************
* SLIDE NUMBER
*********************************************/
.reveal .slide-number {
color: #268bd2;
}
/*********************************************
* PROGRESS BAR
*********************************************/

View File

@ -108,7 +108,10 @@ var Reveal = (function(){
viewDistance: 3,
// Script dependencies to load
dependencies: []
dependencies: [],
// Indicates whether to show the slides number
showSlideNumber: false
},
// Flags if reveal.js is loaded (has dispatched the 'ready' event)
@ -378,6 +381,9 @@ var Reveal = (function(){
'<div class="navigate-up"></div>' +
'<div class="navigate-down"></div>' );
// slide number
createSingletonNode( dom.wrapper, 'div', 'slide-number', '' );
// State background element [DEPRECATED]
createSingletonNode( dom.wrapper, 'div', 'state-background', null );
@ -395,6 +401,7 @@ var Reveal = (function(){
dom.controlsPrev = toArray( document.querySelectorAll( '.navigate-prev' ) );
dom.controlsNext = toArray( document.querySelectorAll( '.navigate-next' ) );
dom.slideNumber = document.querySelector( '.slide-number' );
}
/**
@ -1613,6 +1620,7 @@ var Reveal = (function(){
updateProgress();
updateBackground();
updateParallax();
updateSlideNumber();
// Update the URL hash
writeURL();
@ -1647,6 +1655,7 @@ var Reveal = (function(){
updateControls();
updateProgress();
updateBackground( true );
updateSlideNumber();
}
@ -1851,6 +1860,25 @@ var Reveal = (function(){
}
/**
* Updates the slide number div to reflect the current slide.
*/
function updateSlideNumber() {
// Update slide number if enabled
if( config.showSlideNumber && dom.slideNumber) {
// Display the number of the page using 'indexh - indexv' format
var indexString = indexh;
if( indexv > 0 ) {
indexString += ' - ' + indexv;
}
dom.slideNumber.innerHTML = indexString;
}
}
/**
* Updates the state of all control/navigation arrows.
*/

6
js/reveal.min.js vendored

File diff suppressed because one or more lines are too long