janishutz-legacy/impress.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

impressive typo/bug fixed

Browse Source 
and BTW, firefox doesn't understand transition delay of 0, he needs 0ms... orly?
This commit is contained in:
Bartek Szopka
2011-12-31 10:23:34 +01:00
parent da7a27d44e
commit ec069e1732
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
css/style.css
View File

@@ -199,11 +199,11 @@ a:hover {
-o-transform: translateY(-10px); -o-transform: translateY(-10px);
transform: translateY(-10px); transform: translateY(-10px);
-webkit-transition-delay: 1s; -webkit-transition-delay: 1.5s;
-moz-transition-delay: 1s; -moz-transition-delay: 1.5s;
-ms-transition-delay: 1s; -ms-transition-delay: 1.5s;
-o-transition-delay: 1s; -o-transition-delay: 1.5s;
transition-delay: 1s; transition-delay: 1.5s;
} }
#ing.active .rotating { #ing.active .rotating {
@@ -213,11 +213,11 @@ a:hover {
-o-transform: rotate(-10deg); -o-transform: rotate(-10deg);
transform: rotate(-10deg); transform: rotate(-10deg);
-webkit-transition-delay: 1.5s; -webkit-transition-delay: 1.75s;
-moz-transition-delay: 1.5s; -moz-transition-delay: 1.75s;
-ms-transition-delay: 1.5s; -ms-transition-delay: 1.75s;
-o-transition-delay: 1.5s; -o-transition-delay: 1.75s;
transition-delay: 1.5s; transition-delay: 1.75s;
} }
#ing.active .scaling { #ing.active .scaling {

8
js/impress.js
View File

@@ -184,18 +184,16 @@
} }
}; };
var zoomin = target.scale.x > current.scale.x || var zoomin = target.scale.x >= current.scale.x;
target.scale.y > current.scale.y ||
target.scale.z > current.scale.z;
css(impress, { css(impress, {
transform: scale(target.scale), transform: scale(target.scale),
transitionDelay: (zoomin ? "300ms" : "0") transitionDelay: (zoomin ? "500ms" : "0ms")
}); });
css(canvas, { css(canvas, {
transform: rotate(target.rotate, true) + translate(target.translate), transform: rotate(target.rotate, true) + translate(target.translate),
transformDelay: (zoomin ? "0" : "300ms") transitionDelay: (zoomin ? "0ms" : "500ms")
}); });
current = target; current = target;