aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md2
-rw-r--r--css/reveal.css74
-rw-r--r--css/theme/sky.css6
-rw-r--r--index.html4
-rw-r--r--js/reveal.js6
-rw-r--r--js/reveal.min.js4
6 files changed, 72 insertions, 24 deletions
diff --git a/README.md b/README.md
index 4a2797a..1ed9898 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ Reveal.initialize({
rollingLinks: true,
// Transition style
- transition: 'default' // default/cube/page/concave/linear(2d)
+ transition: 'default' // default/cube/page/concave/zoom/linear/none
});
```
diff --git a/css/reveal.css b/css/reveal.css
index d493b22..358d954 100644
--- a/css/reveal.css
+++ b/css/reveal.css
@@ -538,6 +538,56 @@ body {
/*********************************************
+ * ZOOM TRANSITION
+ *********************************************/
+
+.reveal.zoom .slides>section,
+.reveal.zoom .slides>section>section {
+ -webkit-transition: all 600ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
+ -moz-transition: all 600ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
+ -ms-transition: all 600ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
+ -o-transition: all 600ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
+ transition: all 600ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
+}
+
+.reveal.zoom .slides>section.past {
+ opacity: 0;
+ visibility: hidden;
+
+ -webkit-transform: scale(16);
+ -moz-transform: scale(16);
+ -ms-transform: scale(16);
+ -o-transform: scale(16);
+ transform: scale(16);
+}
+.reveal.zoom .slides>section.future {
+ opacity: 0;
+ visibility: hidden;
+
+ -webkit-transform: scale(0.2);
+ -moz-transform: scale(0.2);
+ -ms-transform: scale(0.2);
+ -o-transform: scale(0.2);
+ transform: scale(0.2);
+}
+
+.reveal.zoom .slides>section>section.past {
+ -webkit-transform: translate(0, -150%);
+ -moz-transform: translate(0, -150%);
+ -ms-transform: translate(0, -150%);
+ -o-transform: translate(0, -150%);
+ transform: translate(0, -150%);
+}
+.reveal.zoom .slides>section>section.future {
+ -webkit-transform: translate(0, 150%);
+ -moz-transform: translate(0, 150%);
+ -ms-transform: translate(0, 150%);
+ -o-transform: translate(0, 150%);
+ transform: translate(0, 150%);
+}
+
+
+/*********************************************
* LINEAR TRANSITION
*********************************************/
@@ -577,12 +627,10 @@ body {
*********************************************/
.reveal.cube .slides {
- margin-top: -350px;
-
- -webkit-perspective-origin: 50% 25%;
- -moz-perspective-origin: 50% 25%;
- -ms-perspective-origin: 50% 25%;
- perspective-origin: 50% 25%;
+ -webkit-perspective-origin: 0% 25%;
+ -moz-perspective-origin: 0% 25%;
+ -ms-perspective-origin: 0% 25%;
+ perspective-origin: 0% 25%;
-webkit-perspective: 1300px;
-moz-perspective: 1300px;
@@ -610,7 +658,7 @@ body {
height: 100%;
left: 0;
top: 0;
- background: #232628;
+ background: rgba(0,0,0,0.1);
border-radius: 4px;
-webkit-transform: translateZ( -20px );
@@ -699,12 +747,10 @@ body {
*********************************************/
.reveal.page .slides {
- margin-top: -350px;
-
- -webkit-perspective-origin: 50% 50%;
- -moz-perspective-origin: 50% 50%;
- -ms-perspective-origin: 50% 50%;
- perspective-origin: 50% 50%;
+ -webkit-perspective-origin: 0% 50%;
+ -moz-perspective-origin: 0% 50%;
+ -ms-perspective-origin: 0% 50%;
+ perspective-origin: 0% 50%;
-webkit-perspective: 3000px;
-moz-perspective: 3000px;
@@ -730,7 +776,7 @@ body {
height: 100%;
left: 0;
top: 0;
- background: rgba(0,0,0,0.2);
+ background: rgba(0,0,0,0.1);
-webkit-transform: translateZ( -20px );
-moz-transform: translateZ( -20px );
diff --git a/css/theme/sky.css b/css/theme/sky.css
index 2f2bee2..92a91af 100644
--- a/css/theme/sky.css
+++ b/css/theme/sky.css
@@ -35,15 +35,15 @@ body {
}
::-moz-selection {
- background:rgba(79, 64, 28, 0.99);
+ background: #134674;
color: white;
}
::-webkit-selection {
- background:rgba(79, 64, 28, 0.99);
+ background: #134674;
color: white;
}
::selection {
- background:rgba(79, 64, 28, 0.99);
+ background: #134674;
color: white;
}
diff --git a/index.html b/index.html
index 5dba9a4..3ea2412 100644
--- a/index.html
+++ b/index.html
@@ -151,7 +151,9 @@
<a href="?transition=cube#/transitions">Cube</a> -
<a href="?transition=page#/transitions">Page</a> -
<a href="?transition=concave#/transitions">Concave</a> -
+ <a href="?transition=zoom#/transitions">Zoom</a> -
<a href="?transition=linear#/transitions">Linear</a> -
+ <a href="?transition=none#/transitions">None</a> -
<a href="?#/transitions">Default</a>
</p>
</section>
@@ -335,7 +337,7 @@ function linkify( selector ) {
history: true,
theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
- transition: Reveal.getQueryHash().transition || 'default', // default/cube/page/concave/linear(2d)
+ transition: Reveal.getQueryHash().transition || 'default', // default/cube/page/concave/zoom/linear/none
// Optional libraries used to extend on reveal.js
dependencies: [
diff --git a/js/reveal.js b/js/reveal.js
index 9293337..56f5578 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -1,5 +1,5 @@
/*!
- * reveal.js 2.1 r29
+ * reveal.js 2.1 r31
* http://lab.hakim.se/reveal-js
* MIT licensed
*
@@ -44,10 +44,10 @@ var Reveal = (function(){
rollingLinks: true,
// Transition style (see /css/theme)
- theme: 'default',
+ theme: null,
// Transition style
- transition: 'default', // default/cube/page/concave/linear(2d),
+ transition: 'default', // default/cube/page/concave/zoom/linear/none
// Script dependencies to load
dependencies: []
diff --git a/js/reveal.min.js b/js/reveal.min.js
index 0b8f16f..5568ab3 100644
--- a/js/reveal.min.js
+++ b/js/reveal.min.js
@@ -1,11 +1,11 @@
/*!
- * reveal.js 2.1 r29
+ * reveal.js 2.1 r31
* http://lab.hakim.se/reveal-js
* MIT licensed
*
* Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se
*/
-var Reveal=(function(){var l=".reveal .slides>section",b=".reveal .slides>section.present>section",R={controls:true,progress:true,history:false,keyboard:true,overview:true,loop:false,autoSlide:0,mouseWheel:true,rollingLinks:true,theme:"default",transition:"default",dependencies:[]},m=0,e=0,y,G,ah=[],f={},T="WebkitPerspective" in document.body.style||"MozPerspective" in document.body.style||"msPerspective" in document.body.style||"OPerspective" in document.body.style||"perspective" in document.body.style,n="WebkitTransform" in document.body.style||"MozTransform" in document.body.style||"msTransform" in document.body.style||"OTransform" in document.body.style||"transform" in document.body.style,z=0,k=0,C=0,aa={startX:0,startY:0,startSpan:0,startCount:0,handled:false,threshold:40};
+var Reveal=(function(){var l=".reveal .slides>section",b=".reveal .slides>section.present>section",R={controls:true,progress:true,history:false,keyboard:true,overview:true,loop:false,autoSlide:0,mouseWheel:true,rollingLinks:true,theme:null,transition:"default",dependencies:[]},m=0,e=0,y,G,ah=[],f={},T="WebkitPerspective" in document.body.style||"MozPerspective" in document.body.style||"msPerspective" in document.body.style||"OPerspective" in document.body.style||"perspective" in document.body.style,n="WebkitTransform" in document.body.style||"MozTransform" in document.body.style||"msTransform" in document.body.style||"OTransform" in document.body.style||"transform" in document.body.style,z=0,k=0,C=0,aa={startX:0,startY:0,startSpan:0,startCount:0,handled:false,threshold:40};
function i(ai){if((!n&&!T)){document.body.setAttribute("class","no-transforms");return;}t(R,ai);P();d();V();}function P(){f.theme=document.querySelector("#theme");
f.wrapper=document.querySelector(".reveal");if(!f.wrapper.querySelector(".progress")&&R.progress){var al=document.createElement("div");al.classList.add("progress");
al.innerHTML="<span></span>";f.wrapper.appendChild(al);}if(!f.wrapper.querySelector(".controls")&&R.controls){var ak=document.createElement("aside");ak.classList.add("controls");