Merge pull request #2439 from CihanSenturk/master

Modal updates
This commit is contained in:
Denis Duliçi 2022-06-09 11:25:32 +03:00 committed by GitHub
commit c07c6fbf50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 8 deletions

View File

@ -11,6 +11,9 @@ class Radio extends Form
/** @var string */
public $formGroupClass = 'sm:col-span-6';
/** @var string */
public $inputGroupClass = 'grid grid-cols-2 gap-3 sm:grid-cols-4';
public $except = [
];

View File

@ -583,7 +583,7 @@ export default {
this.add_new_html = Vue.component('add-new-component', function (resolve, reject) {
resolve({
template: '<div><akaunting-modal-add-new modal-dialog-class="max-w-md" :show="add_new.show" @submit="onSubmit" @cancel="onCancel" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
template: '<div><akaunting-modal-add-new modal-dialog-class="max-w-md" modal-position-top :show="add_new.show" @submit="onSubmit" @cancel="onCancel" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
components: {
AkauntingModalAddNew,

View File

@ -803,7 +803,7 @@ export default {
this.add_new_html = Vue.component('add-new-component', function (resolve, reject) {
resolve({
template: '<div><akaunting-modal-add-new :show="add_new.show" @submit="onSubmit" @cancel="onCancel" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
template: '<div><akaunting-modal-add-new modal-dialog-class="max-w-md" modal-position-top :show="add_new.show" @submit="onSubmit" @cancel="onCancel" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
components: {
AkauntingModalAddNew,

View File

@ -31,7 +31,6 @@
<div @class([
'mt-2',
'grid grid-cols-2 gap-3 sm:grid-cols-4',
$inputGroupClass,
])
>

View File

@ -8,13 +8,14 @@
'credit_card' => trans_choice('accounts.credit_cards', 1),
]"
checked="bank"
input-group-class="grid grid-cols-2 gap-2 sm:grid-cols-2"
/>
<x-form.group.text name="name" label="{{ trans('general.name') }}" />
<x-form.group.text name="name" label="{{ trans('general.name') }}" form-group-class="col-span-6" />
<x-form.group.text name="number" label="{{ trans('accounts.number') }}" />
<x-form.group.text name="number" label="{{ trans('accounts.number') }}" form-group-class="col-span-6" />
<x-form.group.currency without-add-new />
<x-form.group.currency without-add-new form-group-class="col-span-6" />
<x-form.group.money
name="opening_balance"
@ -23,6 +24,7 @@
autofocus="autofocus"
:currency="$currency"
dynamicCurrency="currency"
form-group-class="col-span-6"
/>
<x-form.input.hidden name="enabled" value="1" />

View File

@ -1,8 +1,8 @@
<x-form id="form-create-category" route="categories.store">
<div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
<x-form.group.text name="name" label="{{ trans('general.name') }}" />
<x-form.group.text name="name" label="{{ trans('general.name') }}" form-group-class="col-span-6" />
<x-form.group.color name="color" label="{{ trans('general.color') }}" small />
<x-form.group.color name="color" label="{{ trans('general.color') }}" form-group-class="col-span-6" />
<x-form.input.hidden name="type" :value="$type" />
<x-form.input.hidden name="enabled" value="1" />