merge navigate prev fix #493
This commit is contained in:
		| @@ -1,10 +1,12 @@ | |||||||
| /** | /** | ||||||
|  * A simple theme for reveal.js presentations, similar |  * A simple theme for reveal.js presentations, similar | ||||||
|  * to the default theme. The accent color is darkblue. |  * to the default theme. The accent color is brown. | ||||||
|  * |  * | ||||||
|  * This theme is Copyright (C) 2012 Owen Versteeg, https://github.com/StereotypicalApps. It is MIT licensed. |  * This theme is Copyright (C) 2012-2013 Owen Versteeg, http://owenversteeg.com - it is MIT licensed. | ||||||
|  * reveal.js is Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se; so is the theme - beige.css - that this is based off of. |  | ||||||
|  */ |  */ | ||||||
|  | .reveal a:not(.image) { | ||||||
|  |   line-height: 1.3em; } | ||||||
|  |  | ||||||
| /********************************************* | /********************************************* | ||||||
|  * GLOBAL STYLES |  * GLOBAL STYLES | ||||||
|  *********************************************/ |  *********************************************/ | ||||||
|   | |||||||
| @@ -5,6 +5,9 @@ | |||||||
|  * |  * | ||||||
|  * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se |  * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se | ||||||
|  */ |  */ | ||||||
|  | .reveal a:not(.image) { | ||||||
|  |   line-height: 1.3em; } | ||||||
|  |  | ||||||
| /********************************************* | /********************************************* | ||||||
|  * GLOBAL STYLES |  * GLOBAL STYLES | ||||||
|  *********************************************/ |  *********************************************/ | ||||||
|   | |||||||
| @@ -1,9 +1,8 @@ | |||||||
| /** | /** | ||||||
|  * A simple theme for reveal.js presentations, similar |  * A simple theme for reveal.js presentations, similar | ||||||
|  * to the default theme. The accent color is darkblue. |  * to the default theme. The accent color is brown. | ||||||
|  * |  * | ||||||
|  * This theme is Copyright (C) 2012 Owen Versteeg, https://github.com/StereotypicalApps. It is MIT licensed. |  * This theme is Copyright (C) 2012-2013 Owen Versteeg, http://owenversteeg.com - it is MIT licensed. | ||||||
|  * reveal.js is Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se; so is the theme - beige.css - that this is based off of. |  | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -26,6 +25,9 @@ $linkColor: #51483D; | |||||||
| $linkColorHover: lighten( $linkColor, 20% ); | $linkColorHover: lighten( $linkColor, 20% ); | ||||||
| $selectionBackgroundColor: #26351C; | $selectionBackgroundColor: #26351C; | ||||||
|  |  | ||||||
|  | .reveal a:not(.image) { | ||||||
|  |   line-height: 1.3em; | ||||||
|  | } | ||||||
|  |  | ||||||
|  |  | ||||||
| // Theme template ------------------------------ | // Theme template ------------------------------ | ||||||
|   | |||||||
| @@ -29,6 +29,11 @@ $linkColor: #3b759e; | |||||||
| $linkColorHover: lighten( $linkColor, 20% ); | $linkColorHover: lighten( $linkColor, 20% ); | ||||||
| $selectionBackgroundColor: #134674; | $selectionBackgroundColor: #134674; | ||||||
|  |  | ||||||
|  | // Fix links so they are not cut off | ||||||
|  | .reveal a:not(.image) { | ||||||
|  | 	line-height: 1.3em; | ||||||
|  | } | ||||||
|  |  | ||||||
| // Background generator | // Background generator | ||||||
| @mixin bodyBackground() { | @mixin bodyBackground() { | ||||||
| 	@include radial-gradient( #add9e4, #f7fbfc ); | 	@include radial-gradient( #add9e4, #f7fbfc ); | ||||||
|   | |||||||
| @@ -2051,9 +2051,9 @@ var Reveal = (function(){ | |||||||
| 				var previousSlide = document.querySelector( HORIZONTAL_SLIDES_SELECTOR + '.past:nth-child(' + indexh + ')' ); | 				var previousSlide = document.querySelector( HORIZONTAL_SLIDES_SELECTOR + '.past:nth-child(' + indexh + ')' ); | ||||||
|  |  | ||||||
| 				if( previousSlide ) { | 				if( previousSlide ) { | ||||||
| 					indexv = ( previousSlide.querySelectorAll( 'section' ).length + 1 ) || undefined; | 					var v = ( previousSlide.querySelectorAll( 'section' ).length - 1 ) || undefined; | ||||||
| 					indexh --; | 					var h = indexh - 1; | ||||||
| 					slide( indexh, indexv ); | 					slide( h, v ); | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user