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

Merge branch 'master' of https://github.com/brkcvn/akaunting into tailwind-3.2

Browse Source
This commit is contained in:
Burak Civan 2022-10-27 14:57:08 +03:00
commit c61aab2006
9 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

29
public/css/app.css vendored
View File

@ -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)));

4
resources/assets/js/views/wizard/Company.vue
View File

@ -61,7 +61,7 @@
></akaunting-date>
</div>
<div class="sm:col-span-3 grid gap-10">
<div class="sm:col-span-3 grid gap-y-4">
<div class="sm:col-span-3">
<base-input not-required :label="translations.company.address" :error="onFailErrorGet('address')">
<textarea class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border border-light-gray text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" name="address" data-name="address" rows="3" :placeholder="translations.company.address" v-model="company.address"></textarea>
@ -90,7 +90,7 @@
{{ translations.company.logo }}
</label>
<akaunting-dropzone-file-upload ref="dropzoneWizard" class="form-file dropzone-column w-2/5" style="height:12.2rem" preview-classes="single" :attachments="logo" :v-model="logo">
<akaunting-dropzone-file-upload ref="dropzoneWizard" class="form-file dropzone-column" style="width: 10.8rem; height: 10.8rem;" preview-classes="single" :attachments="logo" :v-model="logo">
</akaunting-dropzone-file-upload>
<div v-if="onFailErrorGet('logo')" class="text-red text-sm mt-1 block" v-html="onFailErrorGet('logo')"></div>

11
resources/assets/sass/app.css vendored
View File

@ -583,6 +583,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;

7
resources/views/banking/transactions/index.blade.php
View File

@ -231,13 +231,6 @@
'description' => trans('general.empty.actions.new', ['type' => trans_choice('general.expenses', 1)]),
'active_badge' => false
],
[
'url' => 'https://akaunting.com/premium-cloud',
'permission' => 'create-banking-transactions',
'text' => trans('import.title', ['type' => trans_choice('general.bank_transactions', 2)]),
'description' => '',
'active_badge' => false
]
]"
/>
@endif

2
resources/views/common/items/index.blade.php
View File

@ -84,7 +84,7 @@
</x-table.td>
<x-table.td class="w-6/12 sm:w-4/12">
<x-slot name="first" class="font-bold" override="class">
<x-slot name="first" class="flex font-bold" override="class">
{{ $item->name }}
@if (! $item->enabled)

2
resources/views/components/documents/form/line-item.blade.php
View File

@ -31,7 +31,7 @@
<td class="px-3 py-3 ltr:pl-2 rtl:pr-2 ltr:text-left rtl:text-right align-middle border-b-0 name">
@if (! $hideItemName)
<span class="flex items-center text-sm" tabindex="0" v-if="row.item_id">
<div v-html="row.name" class="w-20 lg:w-auto truncate"></div>
<div v-html="row.name"></div>
</span>
<div v-else>

4
resources/views/modules/item/show.blade.php
View File

@ -15,7 +15,7 @@
<x-slot name="content">
<div class="flex flex-col space-y-16 py-4">
<div class="flex flex-col lg:flex-row w-full space-x-16 rtl:space-x-reverse space-y-0">
<div class="flex flex-col lg:flex-row w-full lg:space-x-16 rtl:space-x-reverse space-y-0">
<div class="w-full lg:w-7/12 flex flex-col space-x-2 banner">
@foreach ($module->files as $file)
@if ($loop->first)
@ -116,7 +116,7 @@
{!! ! empty($module->sort_desc) ? $module->sort_desc : strip_tags($module->description) !!}
</div>
<div class="relative flex flex-col lg:flex-row space-x-4 justify-between">
<div class="relative flex items-center space-x-4 justify-between">
<x-layouts.modules.show.price :module="$module" />
<div class="flex w-1/2 lg:justify-center">

1
safelist.txt
View File

@ -14,6 +14,7 @@ lg:px-6
lg:relative
lg:right-0
lg:justify-around
lg:space-x-16
ltr:-right-1.5
rtl:-left-1.5
rtl:-scale-x-100