Merge pull request #1234 from ezsystems/revert-1229-EZEE-2975-page-bu…

…ilder-dropdown-widgets-too-low Revert "EZEE-2975: In Page Builder dropdown widgets are too low after being expanded"
ezsystems · Feb 14, 2020 · 36698eb · 36698eb
2 parents 9d483ab + 004283b
commit 36698eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/sidebar/extra.actions.js b/src/bundle/Resources/public/js/scripts/sidebar/extra.actions.js
@@ -26,25 +26,7 @@
                     }
                 };
 
-                if (actions.classList.contains('ez-extra-actions--dropdown')) {
-                    const actionsRect = actions.getBoundingClientRect();
-                    const fitsViewport = actionsRect.height + btn.offsetTop <= global.innerHeight;
-
-                    actions.style.opacity = 0;
-
-                    if (!fitsViewport) {
-                        actions.style.bottom = `0px`;
-                        actions.style.top = 'auto';
-                    } else {
-                        actions.style.top = `${btn.offsetTop}px`;
-                        actions.style.bottom = 'auto';
-                    }
-
-                    actions.style.opacity = 1;
-                } else {
-                    btn.classList[methodNameButton](CLASS_ACTIVE_BUTTON);
-                }
-
+                btn.classList[methodNameButton](CLASS_ACTIVE_BUTTON);
                 actions.classList[methodNameContainer](CLASS_HIDDEN);
 
                 if (!actions.classList.contains(CLASS_HIDDEN)) {

diff --git a/src/bundle/Resources/public/scss/_extra-actions.scss b/src/bundle/Resources/public/scss/_extra-actions.scss
@@ -174,12 +174,12 @@
         opacity: 1;
         transform: translate(calc(-100%), 0) scaleX(1);
         transform-origin: right center;
-        transition: transform 0.4s ease-in, opacity 0.4s ease-in;
+        transition: all 0.4s ease-in;
 
         &--hidden {
             opacity: 0;
             transform: translate(calc(-100%), 0) scaleX(0);
-            transition: transform 0.2s ease-out, opacity 0.2s ease-out;
+            transition: all 0.2s ease-out;
         }
     }
 }