From ef6695ee6d1952457b22d31c209021644cccbb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Tue, 28 Jun 2022 10:40:05 +0300 Subject: [PATCH 1/2] update class list for app show.. --- .../layouts/modules/show/buttons.blade.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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') }} From a50c845a8b1259dcc013b9e3d331ed6aa037e480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Tue, 28 Jun 2022 10:53:37 +0300 Subject: [PATCH 2/2] Fixed notification badge issue ( #33224db ) --- .../components/layouts/admin/scripts.blade.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/resources/views/components/layouts/admin/scripts.blade.php b/resources/views/components/layouts/admin/scripts.blade.php index 84283cda8..1c9e04666 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,14 +151,17 @@ 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"); - + unHiddenSidebar(); contentTransitionRight(); - 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") { @@ -163,6 +170,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"); @@ -178,10 +186,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"); }); }); @@ -201,6 +212,7 @@ profile_icon_html.children[0].classList.remove("hidden"); profile_icon_html.children[1].classList.add("hidden"); + toggleButton.classList.add("invisible"); } @@ -214,6 +226,7 @@ settings_icon_html.children[0].textContent = "cancel"; settings_icon_html.children[0].classList.add("active"); + toggleButton.classList.add("invisible"); } }