merge navigate prev fix #493

This commit is contained in:
Hakim El Hattab 2013-06-16 19:33:57 -04:00
commit 4fde6124e6
5 changed files with 23 additions and 11 deletions

View file

@ -1,10 +1,12 @@
/**
* 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.
* 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.
* This theme is Copyright (C) 2012-2013 Owen Versteeg, http://owenversteeg.com - it is MIT licensed.
*/
.reveal a:not(.image) {
line-height: 1.3em; }
/*********************************************
* GLOBAL STYLES
*********************************************/

View file

@ -5,6 +5,9 @@
*
* Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se
*/
.reveal a:not(.image) {
line-height: 1.3em; }
/*********************************************
* GLOBAL STYLES
*********************************************/

View file

@ -1,9 +1,8 @@
/**
* 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.
* 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.
* This theme is Copyright (C) 2012-2013 Owen Versteeg, http://owenversteeg.com - it is MIT licensed.
*/
@ -26,8 +25,11 @@ $linkColor: #51483D;
$linkColorHover: lighten( $linkColor, 20% );
$selectionBackgroundColor: #26351C;
.reveal a:not(.image) {
line-height: 1.3em;
}
// Theme template ------------------------------
@import "../template/theme";
// ---------------------------------------------
// ---------------------------------------------

View file

@ -29,6 +29,11 @@ $linkColor: #3b759e;
$linkColorHover: lighten( $linkColor, 20% );
$selectionBackgroundColor: #134674;
// Fix links so they are not cut off
.reveal a:not(.image) {
line-height: 1.3em;
}
// Background generator
@mixin bodyBackground() {
@include radial-gradient( #add9e4, #f7fbfc );
@ -38,4 +43,4 @@ $selectionBackgroundColor: #134674;
// Theme template ------------------------------
@import "../template/theme";
// ---------------------------------------------
// ---------------------------------------------

View file

@ -2051,9 +2051,9 @@ var Reveal = (function(){
var previousSlide = document.querySelector( HORIZONTAL_SLIDES_SELECTOR + '.past:nth-child(' + indexh + ')' );
if( previousSlide ) {
indexv = ( previousSlide.querySelectorAll( 'section' ).length + 1 ) || undefined;
indexh --;
slide( indexh, indexv );
var v = ( previousSlide.querySelectorAll( 'section' ).length - 1 ) || undefined;
var h = indexh - 1;
slide( h, v );
}
}
}