slide numbers work in pdf exports, update slide number style
This commit is contained in:
		| @@ -34,7 +34,6 @@ html { | ||||
| .nestedarrow, | ||||
| .reveal .controls, | ||||
| .reveal .progress, | ||||
| .reveal .slide-number, | ||||
| .reveal .playback, | ||||
| .reveal.overview, | ||||
| .fork-reveal, | ||||
| @@ -166,3 +165,13 @@ ul, ol, div, p { | ||||
| 	z-index: 100; | ||||
| } | ||||
|  | ||||
| /* Display slide numbers when 'slideNumber' is enabled */ | ||||
| .reveal .slide-number { | ||||
| 	display: none; | ||||
| } | ||||
| .reveal .slide-number-pdf { | ||||
| 	display: block; | ||||
| 	position: absolute; | ||||
| 	font-size: 14px; | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -273,11 +273,14 @@ html:-moz-full-screen-ancestor { | ||||
| .reveal .slide-number { | ||||
|   position: fixed; | ||||
|   display: block; | ||||
|   right: 15px; | ||||
|   bottom: 15px; | ||||
|   right: 8px; | ||||
|   bottom: 8px; | ||||
|   opacity: 0.5; | ||||
|   z-index: 31; | ||||
|   font-size: 12px; } | ||||
|   font-size: 12px; | ||||
|   color: #fff; | ||||
|   background-color: rgba(0, 0, 0, 0.6); | ||||
|   padding: 5px; } | ||||
|  | ||||
| .reveal .slide-number-delimiter { | ||||
|   margin: 0 4px; } | ||||
|   | ||||
| @@ -329,11 +329,14 @@ html:-moz-full-screen-ancestor { | ||||
| .reveal .slide-number { | ||||
| 	position: fixed; | ||||
| 	display: block; | ||||
| 	right: 15px; | ||||
| 	bottom: 15px; | ||||
| 	right: 8px; | ||||
| 	bottom: 8px; | ||||
| 	opacity: 0.5; | ||||
| 	z-index: 31; | ||||
| 	font-size: 12px; | ||||
| 	color: #fff; | ||||
| 	background-color: rgba( 0, 0, 0, 0.6 ); | ||||
| 	padding: 5px; | ||||
| } | ||||
|  | ||||
| .reveal .slide-number-delimiter { | ||||
|   | ||||
| @@ -288,9 +288,3 @@ body { | ||||
|   -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } | ||||
|  | ||||
| /********************************************* | ||||
|  * SLIDE NUMBER | ||||
|  *********************************************/ | ||||
| .reveal .slide-number { | ||||
|   color: #8b743d; } | ||||
|   | ||||
| @@ -284,9 +284,3 @@ body { | ||||
|   -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } | ||||
|  | ||||
| /********************************************* | ||||
|  * SLIDE NUMBER | ||||
|  *********************************************/ | ||||
| .reveal .slide-number { | ||||
|   color: #42affa; } | ||||
|   | ||||
| @@ -288,12 +288,6 @@ body { | ||||
|   -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } | ||||
|  | ||||
| /********************************************* | ||||
|  * SLIDE NUMBER | ||||
|  *********************************************/ | ||||
| .reveal .slide-number { | ||||
|   color: #a23; } | ||||
|  | ||||
| .reveal p { | ||||
|   font-weight: 300; | ||||
|   text-shadow: 1px 1px #222; } | ||||
|   | ||||
| @@ -290,9 +290,3 @@ body { | ||||
|   -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } | ||||
|  | ||||
| /********************************************* | ||||
|  * SLIDE NUMBER | ||||
|  *********************************************/ | ||||
| .reveal .slide-number { | ||||
|   color: #13DAEC; } | ||||
|   | ||||
| @@ -288,9 +288,3 @@ body { | ||||
|   -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } | ||||
|  | ||||
| /********************************************* | ||||
|  * SLIDE NUMBER | ||||
|  *********************************************/ | ||||
| .reveal .slide-number { | ||||
|   color: #268bd2; } | ||||
|   | ||||
| @@ -282,9 +282,3 @@ body { | ||||
|   -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } | ||||
|  | ||||
| /********************************************* | ||||
|  * SLIDE NUMBER | ||||
|  *********************************************/ | ||||
| .reveal .slide-number { | ||||
|   color: #e7ad52; } | ||||
|   | ||||
| @@ -284,9 +284,3 @@ body { | ||||
|   -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } | ||||
|  | ||||
| /********************************************* | ||||
|  * SLIDE NUMBER | ||||
|  *********************************************/ | ||||
| .reveal .slide-number { | ||||
|   color: #51483D; } | ||||
|   | ||||
| @@ -284,9 +284,3 @@ body { | ||||
|   -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } | ||||
|  | ||||
| /********************************************* | ||||
|  * SLIDE NUMBER | ||||
|  *********************************************/ | ||||
| .reveal .slide-number { | ||||
|   color: #00008B; } | ||||
|   | ||||
| @@ -291,9 +291,3 @@ body { | ||||
|   -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } | ||||
|  | ||||
| /********************************************* | ||||
|  * SLIDE NUMBER | ||||
|  *********************************************/ | ||||
| .reveal .slide-number { | ||||
|   color: #3b759e; } | ||||
|   | ||||
| @@ -288,9 +288,3 @@ body { | ||||
|   -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } | ||||
|  | ||||
| /********************************************* | ||||
|  * SLIDE NUMBER | ||||
|  *********************************************/ | ||||
| .reveal .slide-number { | ||||
|   color: #268bd2; } | ||||
|   | ||||
| @@ -342,11 +342,4 @@ body { | ||||
| 		        transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985); | ||||
| 	} | ||||
|  | ||||
| /********************************************* | ||||
|  * SLIDE NUMBER | ||||
|  *********************************************/ | ||||
| .reveal .slide-number { | ||||
| 	color: $linkColor; | ||||
| } | ||||
|  | ||||
|  | ||||
|   | ||||
| @@ -284,9 +284,3 @@ body { | ||||
|   -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); | ||||
|   transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } | ||||
|  | ||||
| /********************************************* | ||||
|  * SLIDE NUMBER | ||||
|  *********************************************/ | ||||
| .reveal .slide-number { | ||||
|   color: #2a76dd; } | ||||
|   | ||||
							
								
								
									
										53
									
								
								js/reveal.js
									
									
									
									
									
								
							
							
						
						
									
										53
									
								
								js/reveal.js
									
									
									
									
									
								
							| @@ -542,6 +542,19 @@ | ||||
| 		document.body.style.width = pageWidth + 'px'; | ||||
| 		document.body.style.height = pageHeight + 'px'; | ||||
|  | ||||
| 		// Add each slide's index as attributes on itself, we need these | ||||
| 		// indices to generate slide numbers below | ||||
| 		toArray( dom.wrapper.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR ) ).forEach( function( hslide, h ) { | ||||
| 			hslide.setAttribute( 'data-index-h', h ); | ||||
|  | ||||
| 			if( hslide.classList.contains( 'stack' ) ) { | ||||
| 				toArray( hslide.querySelectorAll( 'section' ) ).forEach( function( vslide, v ) { | ||||
| 					vslide.setAttribute( 'data-index-h', h ); | ||||
| 					vslide.setAttribute( 'data-index-v', v ); | ||||
| 				} ); | ||||
| 			} | ||||
| 		} ); | ||||
|  | ||||
| 		// Slide and slide background layout | ||||
| 		toArray( dom.wrapper.querySelectorAll( SLIDES_SELECTOR ) ).forEach( function( slide ) { | ||||
|  | ||||
| @@ -575,7 +588,7 @@ | ||||
| 					background.style.left = -left + 'px'; | ||||
| 				} | ||||
|  | ||||
| 				// If we're configured to `showNotes`, inject them into each slide | ||||
| 				// Inject notes if `showNotes` is enabled | ||||
| 				if( config.showNotes ) { | ||||
| 					var notes = getSlideNotes( slide ); | ||||
| 					if( notes ) { | ||||
| @@ -587,6 +600,18 @@ | ||||
| 						slide.appendChild( notesElement ); | ||||
| 					} | ||||
| 				} | ||||
|  | ||||
| 				// Inject slide numbers if `slideNumbers` are enabled | ||||
| 				if( config.slideNumber ) { | ||||
| 					var slideNumberH = parseInt( slide.getAttribute( 'data-index-h' ), 10 ) + 1, | ||||
| 						slideNumberV = parseInt( slide.getAttribute( 'data-index-v' ), 10 ) + 1; | ||||
|  | ||||
| 					var numberElement = document.createElement( 'div' ); | ||||
| 					numberElement.classList.add( 'slide-number' ); | ||||
| 					numberElement.classList.add( 'slide-number-pdf' ); | ||||
| 					numberElement.innerHTML = formatSlideNumber( slideNumberH, '/', slideNumberV ); | ||||
| 					background.appendChild( numberElement ); | ||||
| 				} | ||||
| 			} | ||||
|  | ||||
| 		} ); | ||||
| @@ -2534,20 +2559,34 @@ | ||||
| 				value.push( getSlidePastCount() + 1 ); | ||||
| 			} | ||||
| 			else if( format === 'c/t' ) { | ||||
| 				value.push( getSlidePastCount() + 1 ); | ||||
| 				value.push( '<span class="slide-number-delimiter">/</span>' ); | ||||
| 				value.push( getTotalSlides() ); | ||||
| 				value.push( getSlidePastCount() + 1, '/', getTotalSlides() ); | ||||
| 			} | ||||
| 			else { | ||||
| 				value.push( indexh + 1 ); | ||||
|  | ||||
| 				if( isVerticalSlide() ) { | ||||
| 					value.push( '<span class="slide-number-delimiter">/</span>' ); | ||||
| 					value.push( indexv + 1 ); | ||||
| 					value.push( '/', indexv + 1 ); | ||||
| 				} | ||||
| 			} | ||||
|  | ||||
| 			dom.slideNumber.innerHTML = value.join( '' ); | ||||
| 			dom.slideNumber.innerHTML = formatSlideNumber( value[0], value[1], value[2] ); | ||||
| 		} | ||||
|  | ||||
| 	} | ||||
|  | ||||
| 	/** | ||||
| 	 * Applies HTML formatting to a slide number before it's | ||||
| 	 * written to the DOM. | ||||
| 	 */ | ||||
| 	function formatSlideNumber( a, delimiter, b ) { | ||||
|  | ||||
| 		if( typeof b === 'number' && !isNaN( b ) ) { | ||||
| 			return  '<span class="slide-number-a">'+ a +'</span>' + | ||||
| 					'<span class="slide-number-delimiter">'+ delimiter +'</span>' + | ||||
| 					'<span class="slide-number-b">'+ b +'</span>'; | ||||
| 		} | ||||
| 		else { | ||||
| 			return '<span class="slide-number-a">'+ a +'</span>'; | ||||
| 		} | ||||
|  | ||||
| 	} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user