From 60e1fa13d06234ff2a7f9e7fdc78b5b437b3631b Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Thu, 13 Nov 2014 16:36:25 -0500
Subject: [PATCH] Revert transition changes, causes overlap issues in some
 animations like popup.

---
 src/definitions/modules/sidebar.js            |  2 +-
 .../default/modules/transition.overrides      | 22 +++++++------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/definitions/modules/sidebar.js b/src/definitions/modules/sidebar.js
index 17d5da7eb..685f56383 100644
--- a/src/definitions/modules/sidebar.js
+++ b/src/definitions/modules/sidebar.js
@@ -366,10 +366,10 @@ $.fn.sidebar = function(parameters) {
           if(settings.transition == 'scale down' || (module.is.mobile() && transition !== 'overlay')) {
             module.scrollToTop();
           }
-          module.add.bodyCSS();
           module.set.transition();
           module.repaint();
           animate = function() {
+            module.add.bodyCSS();
             module.set.animating();
             module.set.visible();
             if(!module.othersActive()) {
diff --git a/src/themes/default/modules/transition.overrides b/src/themes/default/modules/transition.overrides
index 63c73ee2d..19eea2813 100644
--- a/src/themes/default/modules/transition.overrides
+++ b/src/themes/default/modules/transition.overrides
@@ -260,22 +260,22 @@
 @keyframes fadeUpIn {
   0% {
     opacity: 0;
-    transform: translateY(3rem);
+    transform: translateY(10%);
   }
   100% {
     opacity: 1;
-    transform: translateY(0rem);
+    transform: translateY(0%);
   }
 }
 
 @keyframes fadeUpOut {
   0% {
     opacity: 1;
-    transform: translateY(0rem);
+    transform: translateY(0%);
   }
   100% {
     opacity: 0;
-    transform: translateY(3rem);
+    transform: translateY(10%);
   }
 }
 
@@ -283,21 +283,21 @@
 @keyframes fadeDownIn {
   0% {
     opacity: 0;
-    transform: translateY(-3rem);
+    transform: translateY(-10%);
   }
   100% {
     opacity: 1;
-    transform: translateY(0rem);
+    transform: translateY(0%);
   }
 }
 @keyframes fadeDownOut {
   0% {
     opacity: 1;
-    transform: translateY(0rem);
+    transform: translateY(0%);
   }
   100% {
     opacity: 0;
-    transform: translateY(-3rem);
+    transform: translateY(-10%);
   }
 }
 
@@ -305,12 +305,6 @@
       Scale
 ---------------*/
 
-.scale.transition {
-  transform-origin: 50% 10rem;
-  -ms-transform-origin: 50% 10rem;
-  -webkit-transform-origin: 50% 10rem;
-}
-
 .scale.transition.in {
   animation-name: scaleIn;
 }