updated to v2.3, initial implementation of uniformly scaled presentations (#310)

This commit is contained in:
Hakim El Hattab 2013-01-27 23:27:14 -05:00
parent 784fa9d2e3
commit d1c74523a4
6 changed files with 25 additions and 22 deletions

View file

@ -62,17 +62,6 @@ body {
text-shadow: none; text-shadow: none;
} }
@media screen and (max-width: 900px), (max-height: 600px) {
.reveal .slides {
font-size: 0.82em;
}
}
@media screen and (max-width: 700px), (max-height: 400px) {
.reveal .slides {
font-size: 0.66em;
}
}
/********************************************* /*********************************************
* HEADERS * HEADERS
@ -525,17 +514,15 @@ body {
position: relative; position: relative;
width: 100%; width: 100%;
height: 100%; height: 100%;
min-height: 640px; /* min height + 40 to account for padding */
} }
.reveal .slides { .reveal .slides {
position: absolute; position: absolute;
max-width: 900px; width: 100%;
min-height: 600px; height: 100%;
width: 80%;
left: 50%; left: 50%;
top: 50%; top: 50%;
overflow: visible; overflow: visible;
z-index: 1; z-index: 1;
text-align: center; text-align: center;

2
css/reveal.min.css vendored

File diff suppressed because one or more lines are too long

View file

@ -12,7 +12,7 @@ module.exports = function(grunt) {
outputCSS: 'css/reveal.min.css', outputCSS: 'css/reveal.min.css',
meta: { meta: {
version: '2.2', version: '2.3',
banner: banner:
'/*!\n' + '/*!\n' +
' * reveal.js <%= meta.version %> (<%= grunt.template.today("yyyy-mm-dd, HH:MM") %>)\n' + ' * reveal.js <%= meta.version %> (<%= grunt.template.today("yyyy-mm-dd, HH:MM") %>)\n' +

View file

@ -3,7 +3,7 @@
* http://lab.hakim.se/reveal-js * http://lab.hakim.se/reveal-js
* MIT licensed * MIT licensed
* *
* Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se * Copyright (C) 2011-2013 Hakim El Hattab, http://hakim.se
*/ */
var Reveal = (function(){ var Reveal = (function(){
@ -16,6 +16,11 @@ var Reveal = (function(){
// Configurations defaults, can be overridden at initialization time // Configurations defaults, can be overridden at initialization time
config = { config = {
width: 1024,
height: 768,
padding: 0.1,
// Display controls in the bottom right corner // Display controls in the bottom right corner
controls: true, controls: true,
@ -547,6 +552,17 @@ var Reveal = (function(){
*/ */
function layout() { function layout() {
dom.slides.style.width = config.width + 'px';
dom.slides.style.height = config.height + 'px';
var availableWidth = window.innerWidth - ( window.innerWidth * config.padding * 2 ),
availableHeight = window.innerHeight - ( window.innerHeight * config.padding * 2 );
var scale = Math.min( availableWidth / config.width, availableHeight / config.height );
// dom.slides.style.WebkitTransform = 'translate(-50%, -50%) scale('+ scale +') translate(50%, 50%)';
dom.slides.style.zoom = scale;
if( config.center ) { if( config.center ) {
// Select all slides, vertical and horizontal // Select all slides, vertical and horizontal

4
js/reveal.min.js vendored

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
{ {
"name": "reveal.js", "name": "reveal.js",
"version": "2.2.0", "version": "2.3.0",
"description": "The HTML Presentation Framework", "description": "The HTML Presentation Framework",
"homepage": "http://lab.hakim.se/reveal-js", "homepage": "http://lab.hakim.se/reveal-js",
"author": { "author": {