diff --git a/resources/views/components/layouts/admin/scripts.blade.php b/resources/views/components/layouts/admin/scripts.blade.php index 3c9e6a982..8a18f3d56 100644 --- a/resources/views/components/layouts/admin/scripts.blade.php +++ b/resources/views/components/layouts/admin/scripts.blade.php @@ -58,6 +58,7 @@ function contentTransitionLeft() { sectionContent.classList.add("xl:ltr:ml-0", "xl:rtl:mr-0"); sectionContent.classList.remove("xl:ltr:ml-64", "xl:rtl:mr-64"); + toggleButton.querySelector("span").classList.add("ltr:-rotate-90", "rtl:rotate-90"); } @@ -65,16 +66,19 @@ function contentTransitionRight() { sectionContent.classList.remove("xl:ltr:ml-0", "xl:rtl:mr-0"); sectionContent.classList.add("xl:ltr:ml-64", "xl:rtl:mr-64"); + toggleButton.querySelector("span").classList.remove("ltr:-rotate-90", "rtl:rotate-90"); } function hiddenSidebar() { sideBar.classList.add("menu-list-hidden"); + toggleButton.classList.add("ltr:left-12", "rtl:right-12"); } function unHiddenSidebar() { toggleButton.classList.remove("ltr:left-12", "rtl:right-12"); + sideBar.classList.remove("menu-list-hidden"); } @@ -147,6 +151,7 @@ menu.classList.remove("ltr:-left-80", "rtl:-right-80"); menu.classList.add("ltr:left-14", "rtl:right-14"); + mainContent.classList.add("hidden"); toggleButton.classList.add("invisible"); menuClose.classList.remove("hidden"); @@ -163,7 +168,9 @@ sectionContent.classList.add("xl:ltr:ml-64", "xl:rtl:mr-64"); //for hidden menu, show close icon scenario - notificationCount("none"); + if (menuRef === "notifications-menu") { + notificationCount("none"); + } //remove active (cancel text) class form target icon } else if (menu.classList.contains(menuRef) && iconButton.children[0].textContent == "cancel") { @@ -172,6 +179,7 @@ menu.classList.add("ltr:-left-80", "rtl:-right-80"); menu.classList.remove("ltr:left-14", "rtl:right-14"); + mainContent.classList.remove("hidden"); toggleButton.classList.remove("invisible"); menuClose.classList.add("hidden"); @@ -187,10 +195,13 @@ menuClose.addEventListener("click", function() { menu.classList.add("ltr:-left-80", "rtl:-right-80"); menu.classList.remove("ltr:left-14", "rtl:right-14"); + iconButton.children[0].textContent = icon; iconButton.children[0].classList.remove("active"); + mainContent.classList.remove("hidden"); this.classList.add("hidden"); + toggleButton.classList.remove("invisible"); }); }); @@ -210,6 +221,7 @@ profile_icon_html.children[0].classList.remove("hidden"); profile_icon_html.children[1].classList.add("hidden"); + toggleButton.classList.add("invisible"); } @@ -223,6 +235,7 @@ settings_icon_html.children[0].textContent = "cancel"; settings_icon_html.children[0].classList.add("active"); + toggleButton.classList.add("invisible"); } } diff --git a/resources/views/components/layouts/modules/show/buttons.blade.php b/resources/views/components/layouts/modules/show/buttons.blade.php index 4093c0286..0a2ebd180 100644 --- a/resources/views/components/layouts/modules/show/buttons.blade.php +++ b/resources/views/components/layouts/modules/show/buttons.blade.php @@ -4,7 +4,7 @@ {{ trans('modules.get_premium_cloud') }} @@ -14,7 +14,7 @@ @can('delete-modules-item') @@ -37,7 +37,7 @@ @else @@ -71,7 +71,7 @@ {{ trans('modules.use_app') }} @@ -84,7 +84,7 @@ {{ trans('modules.install_cloud') }} @@ -93,7 +93,7 @@ {{ trans('modules.get_cloud') }}