shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk 2022-11-24 18:29:34 +03:00
commit 691aa91fc6
10 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/akaunting-js/generalAction.js vendored
View File

@ -451,16 +451,18 @@ 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 (defaultText.closest('tr')) {
let icon_parents_element = defaultText.parentElement.parentElement.parentElement;
if (icon_parents_element.classList.contains('flex')) {
icon_parents_element.appendChild(defaultText);
icon_parents_element.classList.remove('truncate');
} else {
if (icon_parents_element.classList.contains('overflow-x-hidden')) {
icon_parents_element.parentElement.appendChild(defaultText);
if (icon_parents_element.classList.contains('flex')) {
icon_parents_element.appendChild(defaultText);
icon_parents_element.classList.remove('truncate');
} else {
defaultText.parentElement.appendChild(defaultText);
if (icon_parents_element.classList.contains('overflow-x-hidden')) {
icon_parents_element.parentElement.appendChild(defaultText);
} else {
defaultText.parentElement.appendChild(defaultText);
}
}
}
});

2
resources/assets/js/mixins/global.js vendored
View File

@ -179,7 +179,7 @@ export default {
//swiper slider for long tabs items
for (let [index, item] of document.querySelectorAll('[data-swiper]').entries()) {
if (item.clientWidth < item.querySelector('[data-tabs-swiper-wrapper]').clientWidth) {
if (item.clientWidth < item.querySelector('[data-tabs-swiper-wrapper]').clientWidth && ! item.querySelector('[data-tabs-swiper-wrapper]').getAttribute('data-disable-slider', true)) {
let initial_slide = 0;
let hash_split = window.location.hash.split('#')[1];
let loop = 0;

4
resources/views/components/layouts/admin/header.blade.php
View File

@ -3,7 +3,7 @@
<div id="header" class="xl:pt-6 -mt-2">
<div class="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
<div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
<div class="flex items-center">
<div class="flex items-center space-y-4">
<h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
<x-title>
{!! $title !!}
@ -13,7 +13,7 @@
</h1>
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4 mt-2">
<div class="ltr:ml-4 rtl:mr-4 -mt-4">
{!! $status !!}
</div>
@endif

4
resources/views/components/layouts/portal/header.blade.php
View File

@ -3,7 +3,7 @@
<div id="header" class="xl:pt-6 -mt-2">
<div class="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
<div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
<div class="flex items-center">
<div class="flex items-center space-y-4">
<h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
<x-title>
{!! $title !!}
@ -13,7 +13,7 @@
</h1>
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4 mt-2">
<div class="ltr:ml-4 rtl:mr-4 -mt-4">
{!! $status !!}
</div>
@endif

4
resources/views/components/layouts/preview/header.blade.php
View File

@ -3,7 +3,7 @@
<div id="header" class="xl:pt-6 -mt-2">
<div class="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
<div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
<div class="flex items-center">
<div class="flex items-center space-y-4">
<h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
<x-title>
{!! $title !!}
@ -13,7 +13,7 @@
</h1>
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4 mt-2">
<div class="ltr:ml-4 rtl:mr-4 -mt-4">
{!! $status !!}
</div>
@endif

4
resources/views/components/layouts/signed/header.blade.php
View File

@ -3,7 +3,7 @@
<div id="header" class="xl:pt-6 -mt-2">
<div lass="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
<div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
<div class="flex items-center">
<div class="flex items-center space-y-4">
<h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
<x-title>
{!! $title !!}
@ -13,7 +13,7 @@
</h1>
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4 mt-2">
<div class="ltr:ml-4 rtl:mr-4 -mt-4">
{!! $status !!}
</div>
@endif

2
resources/views/components/tabs/index.blade.php
View File

@ -10,7 +10,7 @@
<div data-swiper="{{ $slides }}" x-data="{ active: window.location.hash.split('#')[1] == undefined ? '{{ $active }}' : window.location.hash.split('#')[1] }">
<div data-tabs-swiper>
<ul data-tabs-swiper-wrapper {{ ((! $attributes->has('override')) || ($attributes->has('override') && ! in_array('class', explode(',', $attributes->get('override'))))) ? $attributes->merge(['class' => 'inline-flex']) : $attributes }}>
<ul data-tabs-swiper-wrapper {{ ((! $attributes->has('override')) || ($attributes->has('override') && ! in_array('class', explode(',', $attributes->get('override'))))) ? $attributes->merge(['class' => 'inline-flex overflow-x-scroll large-overflow-unset']) : $attributes }}>
{!! $navs !!}
</ul>
</div>

2
resources/views/components/tabs/nav-link.blade.php
View File

@ -1,7 +1,7 @@
@props(['id', 'name', 'href', 'active'])
<li
class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link"
class="relative flex-auto px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link"
id="tab-{{ $id }}"
data-id="tab-{{ $id }}"
data-tabs="{{ $id }}"

2
resources/views/components/tabs/nav.blade.php
View File

@ -1,7 +1,7 @@
@props(['id', 'name', 'active'])
<li
class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link"
class="relative flex-auto px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link"
id="tab-{{ $id }}"
data-id="tab-{{ $id }}"
data-tabs="{{ $id }}"

2
resources/views/livewire/menu/favorite.blade.php
View File

@ -3,7 +3,7 @@
<span
id="{{ $favorited ? 'remove-from-favorite' : 'add-to-favorite' }}"
@class([
'flex items-center text-purple text-2xl ltr:ml-2 rtl:mr-2 lg:mt-4 cursor-pointer',
'flex items-center text-purple text-2xl ltr:ml-2 rtl:mr-2 cursor-pointer',
'material-icons-outlined transform transition-all hover:scale-125' => ($favorited) ? false : true,
'material-icons' => (! $favorited) ? false : true,
])