Merge pull request #2430 from brkcvn/master

Ui feedbacks & bugs fixed
This commit is contained in:
Burak Civan 2022-06-07 09:37:45 +03:00 committed by GitHub
commit 593ef5b98f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 32 additions and 28 deletions

16
public/css/app.css vendored
View File

@ -36387,6 +36387,10 @@ body{
right: 3rem;
}
[dir="ltr"] .ltr\:right-2{
right: 0.5rem;
}
[dir="ltr"] .ltr\:-right-2{
right: -0.5rem;
}
@ -36419,10 +36423,6 @@ body{
left: -2rem;
}
[dir="ltr"] .ltr\:right-2{
right: 0.5rem;
}
[dir="ltr"] .ltr\:right-4{
right: 1rem;
}
@ -36547,6 +36547,10 @@ body{
left: 3rem;
}
[dir="rtl"] .rtl\:left-2{
left: 0.5rem;
}
[dir="rtl"] .rtl\:-left-2{
left: -0.5rem;
}
@ -36579,10 +36583,6 @@ body{
right: -2rem;
}
[dir="rtl"] .rtl\:left-2{
left: 0.5rem;
}
[dir="rtl"] .rtl\:left-4{
left: 1rem;
}

View File

@ -15,7 +15,7 @@ th, td
padding: 10px 9px 10px 9px;
}
p {
.print-template p {
color: #424242;
margin-bottom: 9px;
}

View File

@ -4,13 +4,15 @@
</x-slot>
<x-slot name="status">
@if (! $account->enabled)
<x-index.disable text="{{ trans_choice('general.accounts', 1) }}" />
@endif
<div class="mt-3">
@if (! $account->enabled)
<x-index.disable text="{{ trans_choice('general.accounts', 1) }}" />
@endif
@if (setting('default.account') == $account->id)
<x-index.default text="{{ trans('accounts.default_account') }}" />
@endif
@if (setting('default.account') == $account->id)
<x-index.default text="{{ trans('accounts.default_account') }}" />
@endif
</div>
</x-slot>
<x-slot name="favorite"

View File

@ -1,4 +1,4 @@
<div class="p-7 shadow-2xl rounded-2xl">
<div class="p-7 shadow-2xl rounded-2xl print-template">
@if ($documentTemplate)
@switch($documentTemplate)
@case('classic')

View File

@ -1,5 +1,5 @@
<x-tooltip id="{{ $id }}" placement="{{ $position }}" message="{{ $text }}">
<span class="material-icons{{ $iconType }} text-purple text-xl ml-2 lg:mt-2">
<span class="material-icons{{ $iconType }} text-purple text-sm ml-2">
{{ $icon }}
</span>
</x-tooltip>

View File

@ -1,5 +1,5 @@
<x-tooltip id="{{ $id }}" placement="{{ $position }}" message="{{ $disableText }}">
<span class="material-icons{{ $iconType }} text-red text-xl ml-2 lg:mt-2">
<span class="material-icons{{ $iconType }} text-red text-sm ml-2">
{{ $icon }}
</span>
</x-tooltip>

View File

@ -6,7 +6,7 @@
<span class="material-icons text-base">attach_file</span>
@endif
<div class="flex flex-col text-gray-500 ml-3 gap-y-1">
<span class="w-80 text-sm truncate">{{ $file->basename }}</span>
<span class="w-64 text-sm truncate">{{ $file->basename }}</span>
<span class="text-xs mb-0">{{ $file->readableSize() }}</span>
</div>
</div>

View File

@ -49,8 +49,8 @@
{{ $class->row_names[$table_key][$id] }}
@if (array_sum($parent_row_values) != array_sum($class->row_values[$table_key][$id]))
<button type="button" class="align-text-top" node="child-{{ $id }}" onClick="toggleSub('child-{{ $id }}', event)">
<span class="material-icons transform transition-all rotate-90 text-lg leading-none">navigate_next</span>
<button type="button" class="align-text-top flex" node="child-{{ $id }}" onClick="toggleSub('child-{{ $id }}', event)">
<span class="material-icons transform rotate-90 transition-all text-lg leading-none">expand_more</span>
</button>
@endif
</td>

View File

@ -24,6 +24,8 @@
@include($class->views['filter'])
@include($class->views[$class->type])
<x-loading.content />
</div>
</x-slot>

View File

@ -51,8 +51,8 @@
<div class="flex items-center" style="padding-left: {{ $tree_level * 20 }}px;">
<span>{{ $class->row_names[$table_key][$id] }}</span>
@if (array_sum($parent_row_values) != array_sum($class->row_values[$table_key][$id]))
<button type="button" class="align-text-top" node="child-{{ $id }}" onClick="toggleSub('child-{{ $id }}', event)">
<span class="material-icons transform transition-all rotate-90 text-lg leading-none">navigate_next</span>
<button type="button" class="align-text-top flex" node="child-{{ $id }}" onClick="toggleSub('child-{{ $id }}', event)">
<span class="material-icons transform rotate-90 transition-all text-lg leading-none">navigate_next</span>
</button>
@endif
</div>

View File

@ -14,7 +14,7 @@
x-ref="accordion_{{ $type }}"
x-bind:class="{{ $type }} == 'open' ? 'h-auto ' : 'scale-y-0 h-0'"
>
<div class="my-3 space-x-3 rtl:space-x-reverse">
<div class="my-3">
{!! $body !!}
</div>
</div>

View File

@ -1,4 +1,4 @@
<div class="p-7 shadow-2xl rounded-2xl">
<div class="p-7 shadow-2xl rounded-2xl print-template">
@if ($transactionTemplate)
@switch($transactionTemplate)
@case('classic')

View File

@ -6,7 +6,7 @@
</div>
<div class="w-full lg:w-7/12">
<div class="p-7 shadow-2xl rounded-2xl">
<div class="p-7 shadow-2xl rounded-2xl print-template">
<x-transfers.show.template :model="$transfer" />
</div>
</div>

View File

@ -81,7 +81,7 @@
node="child-{{ $category->id }}"
onClick="toggleSub('child-{{ $category->id }}', event)"
>
<span class="material-icons transform transition-all text-lg leading-none align-middle text-white">navigate_next</span>
<span class="material-icons transform rotate-90 transition-all text-lg leading-none align-middle text-white">chevron_right</span>
</button>
</x-tooltip>
</div>

View File

@ -18,7 +18,7 @@
node="child-{{ $sub_category->id }}"
onClick="toggleSub('child-{{ $sub_category->id }}', event)"
>
<span class="material-icons transform transition-all text-lg leading-none align-middle text-white">navigate_next</span>
<span class="material-icons transform rotate-90 transition-all text-lg leading-none align-middle text-white">chevron_right</span>
</button>
</x-tooltip>
</div>