diff --git a/public/akaunting-js/generalAction.js b/public/akaunting-js/generalAction.js index f76732771..cbf0431bc 100644 --- a/public/akaunting-js/generalAction.js +++ b/public/akaunting-js/generalAction.js @@ -426,14 +426,16 @@ document.querySelectorAll('[data-truncate-marquee]').forEach((truncate) => { //disable/enable icons ejected from data-truncate-marquee, HTML of icons ejected from parent element (data-truncate-marquee) document.querySelectorAll('[data-index-icon]').forEach((defaultText) => { let icon_parents_element = defaultText.parentElement.parentElement.parentElement; - + if (icon_parents_element.classList.contains('flex')) { icon_parents_element.appendChild(defaultText); } else { - icon_parents_element.parentElement.appendChild(defaultText); + if (icon_parents_element.classList.contains('overflow-x-hidden')) { + icon_parents_element.parentElement.appendChild(defaultText); + } else { + defaultText.parentElement.appendChild(defaultText); + } } - - // defaultText.parentElement.parentElement.parentElement.parentElement.appendChild(defaultText); }); //disable/enable icons ejected from data-truncate-marquee diff --git a/public/css/app.css b/public/css/app.css index e389412ea..7012ce4ee 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -48093,6 +48093,17 @@ html[dir="rtl"] .lines-radius-border thead td:last-child { padding: 4px 15px; } +/* document body selected */ +::-moz-selection { + background: #55588B; + color: #FFFFFF; +} +::selection { + background: #55588B; + color: #FFFFFF; +} +/* document body selected */ + input[type=number]::-webkit-outer-spin-button, input[type=number]::-webkit-inner-spin-button { -webkit-appearance: none; @@ -50907,11 +50918,15 @@ body{ width: 66.666667%; } +<<<<<<< HEAD .lg\:w-auto{ width: auto; } .lg\:w-1\/4{ +======= + .lg\:w-1\/4{ +>>>>>>> 5e6189ea01b66add0ae279090a240066f32f90b3 width: 25%; } @@ -50927,7 +50942,15 @@ body{ width: 1rem; } +<<<<<<< HEAD .lg\:w-2\/4{ +======= + .lg\:w-auto{ + width: auto; + } + + .lg\:w-2\/4{ +>>>>>>> 5e6189ea01b66add0ae279090a240066f32f90b3 width: 50%; } @@ -51020,6 +51043,12 @@ body{ gap: 4rem; } + .lg\:space-x-16 > :not([hidden]) ~ :not([hidden]){ + --tw-space-x-reverse: 0; + margin-right: calc(4rem * var(--tw-space-x-reverse)); + margin-left: calc(4rem * calc(1 - var(--tw-space-x-reverse))); + } + .lg\:space-y-0 > :not([hidden]) ~ :not([hidden]){ --tw-space-y-reverse: 0; margin-top: calc(0px * calc(1 - var(--tw-space-y-reverse))); diff --git a/resources/assets/js/views/wizard/Company.vue b/resources/assets/js/views/wizard/Company.vue index 23995a026..42831b9b5 100644 --- a/resources/assets/js/views/wizard/Company.vue +++ b/resources/assets/js/views/wizard/Company.vue @@ -61,7 +61,7 @@ > -