Merge branch 'master' of https://github.com/brkcvn/akaunting into form-elements

This commit is contained in:
Burak Civan
2022-06-28 16:46:57 +03:00
54 changed files with 12529 additions and 980 deletions

View File

@@ -84,9 +84,9 @@
<div class="flex ltr:ml-2 rtl:mr-2">
<span class="w-28 text-left block text-base truncate">
<span class="border-b border-transparent transition-all hover:border-black">
<x-link.hover>
{{ Str::limit(setting('company.name'), 22) }}
</span>
</x-link.hover>
</span>
@can('read-common-companies')
@@ -169,7 +169,7 @@
<span class="material-icons text-lg text-purple transform ltr:rotate-90 rtl:-rotate-90">expand_circle_down</span>
</button>
<span data-menu-close class="material-icons absolute ltr:-right-2 rtl:right-12 top-8 text-lg text-purple cursor-pointer z-10 hidden">cancel</span>
<span data-menu-close class="material-icons absolute ltr:-right-2 rtl:right-12 transition-all top-8 text-lg text-purple cursor-pointer z-10 hidden">cancel</span>
<div class="fixed w-full h-full invisible lg:hidden js-menu-background" style="background-color: rgba(0, 0, 0, 0.5); z-index: -1;"></div>
</div>

View File

@@ -137,8 +137,18 @@
mainContent.classList.add("hidden");
toggleButton.classList.add("invisible");
menuClose.classList.remove("hidden");
unHiddenSidebar();
contentTransitionRight();
//for hidden menu, show close icon scenario
if (sideBar.classList.contains("menu-list-hidden")) {
menuClose.classList.add("ltr:-right-57", "rtl:right-59");
menuClose.classList.remove("ltr:-right-2", "rtl:right-12");
} else {
menuClose.classList.add("ltr:-right-2", "rtl:right-12");
}
sectionContent.classList.remove("xl:ltr:ml-0", "xl:rtl:mr-0");
sectionContent.classList.add("xl:ltr:ml-64", "xl:rtl:mr-64");
//for hidden menu, show close icon scenario
//remove active (cancel text) class form target icon
} else if (menu.classList.contains(menuRef) && iconButton.children[0].textContent == "cancel") {
@@ -164,6 +174,13 @@
mainContent.classList.remove("hidden");
this.classList.add("hidden");
toggleButton.classList.remove("invisible");
//for hidden menu, show close icon scenario
if (sideBar.classList.contains("menu-list-hidden")) {
sectionContent.classList.add("xl:ltr:ml-0", "xl:rtl:mr-0");
sectionContent.classList.remove("xl:ltr:ml-64", "xl:rtl:mr-64");
}
//for hidden menu, show close icon scenario
});
});
}