Browse Source

Revert transition changes, causes overlap issues in some animations like popup.

pull/1243/merge
jlukic 10 years ago
parent
commit
60e1fa13d0
2 changed files with 9 additions and 15 deletions
  1. 2
      src/definitions/modules/sidebar.js
  2. 22
      src/themes/default/modules/transition.overrides

2
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()) {

22
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;
}

Loading…
Cancel
Save