diff --git a/assets/styles/layout/_animation.scss b/assets/styles/layout/_animation.scss index 3ca6c38c5..d7d3f71f0 100644 --- a/assets/styles/layout/_animation.scss +++ b/assets/styles/layout/_animation.scss @@ -51,22 +51,22 @@ } .px-scalein { - animation: scalein 150ms linear; + animation: px-scalein 150ms linear; } .px-fadein { - animation: fadein 150ms linear; + animation: px-fadein 150ms linear; } .px-fadeout { - animation: fadeout 150ms linear; + animation: px-fadeout 150ms linear; } .px-slidedown { - animation: slidedown 0.45s ease-in-out; + animation: px-slidedown 0.45s ease-in-out; } .px-slideup { - animation: slideup 0.45s cubic-bezier(0, 1, 0, 1); + animation: px-slideup 0.45s cubic-bezier(0, 1, 0, 1); } \ No newline at end of file diff --git a/assets/styles/layout/_sidebar.scss b/assets/styles/layout/_sidebar.scss index a573fd870..a4e42d79a 100644 --- a/assets/styles/layout/_sidebar.scss +++ b/assets/styles/layout/_sidebar.scss @@ -104,6 +104,8 @@ } > div { + overflow: hidden; + ol { margin: 0 0 0 1rem; padding: .25rem 0; diff --git a/components/lib/styleclass/StyleClass.js b/components/lib/styleclass/StyleClass.js index 81a7b9480..6816d7adc 100644 --- a/components/lib/styleclass/StyleClass.js +++ b/components/lib/styleclass/StyleClass.js @@ -41,7 +41,7 @@ const StyleClass = BaseStyleClass.extend('styleclass', { if (!target.$_pstyleclass_animating) { target.$_pstyleclass_animating = true; - if (binding.value.enterActiveClass === 'slidedown') { + if (binding.value.enterActiveClass.includes('slidedown')) { target.style.height = '0px'; DomHandler.removeClass(target, 'hidden'); target.style.maxHeight = target.scrollHeight + 'px'; @@ -69,7 +69,7 @@ const StyleClass = BaseStyleClass.extend('styleclass', { target.removeEventListener('animationend', target.$p_styleclass_enterlistener); - if (binding.value.enterActiveClass === 'slidedown') { + if (binding.value.enterActiveClass.includes('slidedown')) { target.style.maxHeight = ''; } diff --git a/layouts/AppMenuItem.vue b/layouts/AppMenuItem.vue index d160bde2b..59ee3d571 100644 --- a/layouts/AppMenuItem.vue +++ b/layouts/AppMenuItem.vue @@ -1,6 +1,6 @@