From ec069e17320ae2549061f8f2583b134e7e96f208 Mon Sep 17 00:00:00 2001
From: Bartek Szopka <bartek.szopka+github@gmail.com>
Date: Sat, 31 Dec 2011 10:23:34 +0100
Subject: [PATCH] impressive typo/bug fixed

and BTW, firefox doesn't understand transition delay of 0, he needs 0ms... orly?
---
 css/style.css | 20 ++++++++++----------
 js/impress.js |  8 +++-----
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/css/style.css b/css/style.css
index 19cb809..75191ed 100644
--- a/css/style.css
+++ b/css/style.css
@@ -199,11 +199,11 @@ a:hover {
     -o-transform:      translateY(-10px);
     transform:         translateY(-10px);
 
-    -webkit-transition-delay: 1s;
-    -moz-transition-delay:    1s;
-    -ms-transition-delay:     1s;
-    -o-transition-delay:      1s;
-    transition-delay:         1s;
+    -webkit-transition-delay: 1.5s;
+    -moz-transition-delay:    1.5s;
+    -ms-transition-delay:     1.5s;
+    -o-transition-delay:      1.5s;
+    transition-delay:         1.5s;
 }
 
 #ing.active .rotating {
@@ -213,11 +213,11 @@ a:hover {
     -o-transform:      rotate(-10deg);
     transform:         rotate(-10deg);
 
-    -webkit-transition-delay: 1.5s;
-    -moz-transition-delay:    1.5s;
-    -ms-transition-delay:     1.5s;
-    -o-transition-delay:      1.5s;
-    transition-delay:         1.5s;
+    -webkit-transition-delay: 1.75s;
+    -moz-transition-delay:    1.75s;
+    -ms-transition-delay:     1.75s;
+    -o-transition-delay:      1.75s;
+    transition-delay:         1.75s;
 }
 
 #ing.active .scaling {
diff --git a/js/impress.js b/js/impress.js
index 5a510a6..593a15c 100644
--- a/js/impress.js
+++ b/js/impress.js
@@ -184,18 +184,16 @@
             }
         };
 
-        var zoomin = target.scale.x > current.scale.x ||
-                     target.scale.y > current.scale.y ||
-                     target.scale.z > current.scale.z;
+        var zoomin = target.scale.x >= current.scale.x;
         
         css(impress, {
             transform: scale(target.scale),
-            transitionDelay: (zoomin ? "300ms" : "0")
+            transitionDelay: (zoomin ? "500ms" : "0ms")
         });
         
         css(canvas, {
             transform: rotate(target.rotate, true) + translate(target.translate),
-            transformDelay: (zoomin ? "0" : "300ms")
+            transitionDelay: (zoomin ? "0ms" : "500ms")
         });
         
         current = target;