From a62fce5d71b78517bc423202fd9af188aeab582e Mon Sep 17 00:00:00 2001 From: batuhanbas Date: Wed, 29 Jan 2020 06:19:03 +0300 Subject: [PATCH] invoice and bill tax alignment --- public/css/element.css | 23 +++++++------------ .../views/purchases/bills/create.blade.php | 4 ++-- .../views/purchases/bills/edit.blade.php | 4 ++-- .../views/purchases/bills/item.blade.php | 4 ++-- .../views/sales/invoices/create.blade.php | 4 ++-- resources/views/sales/invoices/edit.blade.php | 4 ++-- resources/views/sales/invoices/item.blade.php | 4 ++-- 7 files changed, 20 insertions(+), 27 deletions(-) diff --git a/public/css/element.css b/public/css/element.css index c470e578b..85e89145b 100644 --- a/public/css/element.css +++ b/public/css/element.css @@ -2609,8 +2609,13 @@ max-width: unset !important; } -.select-tax .el-select span:first-of-type { - width: 60px !important; +:first-of-type.select-tax .el-select span:first-of-type { + width: 125px !important; + overflow: hidden; +} + +.select-tax .el-select span:last-of-type { + width: 40px !important; overflow: hidden; } @@ -2619,7 +2624,7 @@ } .select-tax .el-select .el-select__tags .el-select__tags-text { - width: 20px !important; + width: 82px !important; overflow: hidden; } @@ -15459,22 +15464,10 @@ max-width: unset !important; } -.select-tax .el-select span:first-of-type -{ - width: 60px !important; - overflow: hidden; -} - .select-tax .el-input--prefix .el-input__inner { padding-left: 23px !important; } -.select-tax .el-select .el-select__tags .el-select__tags-text -{ - width: 20px !important; - overflow: hidden; -} - .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after { right: 4px !important; diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php index db45e9773..2b38b12db 100644 --- a/resources/views/purchases/bills/create.blade.php +++ b/resources/views/purchases/bills/create.blade.php @@ -44,7 +44,7 @@ @stack('name_th_end') @stack('quantity_th_start') - {{ trans('bills.quantity') }} + {{ trans('bills.quantity') }} @stack('quantity_th_end') @stack('price_th_start') @@ -52,7 +52,7 @@ @stack('price_th_end') @stack('taxes_th_start') - {{ trans_choice('general.taxes', 1) }} + {{ trans_choice('general.taxes', 1) }} @stack('taxes_th_end') @stack('total_th_start') diff --git a/resources/views/purchases/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php index 965833b8c..8b3861016 100644 --- a/resources/views/purchases/bills/edit.blade.php +++ b/resources/views/purchases/bills/edit.blade.php @@ -45,7 +45,7 @@ @stack('name_th_end') @stack('quantity_th_start') - {{ trans('bills.quantity') }} + {{ trans('bills.quantity') }} @stack('quantity_th_end') @stack('price_th_start') @@ -53,7 +53,7 @@ @stack('price_th_end') @stack('taxes_th_start') - {{ trans_choice('general.taxes', 1) }} + {{ trans_choice('general.taxes', 1) }} @stack('taxes_th_end') @stack('total_th_start') diff --git a/resources/views/purchases/bills/item.blade.php b/resources/views/purchases/bills/item.blade.php index 622fd53e2..a518e037e 100644 --- a/resources/views/purchases/bills/item.blade.php +++ b/resources/views/purchases/bills/item.blade.php @@ -51,7 +51,7 @@ @stack('name_td_end') @stack('quantity_td_start') - + @stack('quantity_input_start') + @stack('tax_id_input_start') {{ Form::multiSelectAddNewGroup('tax_id', '', '', $taxes, '', [ 'data-item' => 'tax_id', diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php index 163d00111..83709f6e7 100644 --- a/resources/views/sales/invoices/create.blade.php +++ b/resources/views/sales/invoices/create.blade.php @@ -44,7 +44,7 @@ @stack('name_th_end') @stack('quantity_th_start') - {{ trans($text_override['quantity']) }} + {{ trans($text_override['quantity']) }} @stack('quantity_th_end') @stack('price_th_start') @@ -52,7 +52,7 @@ @stack('price_th_end') @stack('taxes_th_start') - {{ trans_choice('general.taxes', 1) }} + {{ trans_choice('general.taxes', 1) }} @stack('taxes_th_end') @stack('total_th_start') diff --git a/resources/views/sales/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php index b75d6c891..84ad0ebe1 100644 --- a/resources/views/sales/invoices/edit.blade.php +++ b/resources/views/sales/invoices/edit.blade.php @@ -45,7 +45,7 @@ @stack('name_th_end') @stack('quantity_th_start') - {{ trans($text_override['quantity']) }} + {{ trans($text_override['quantity']) }} @stack('quantity_th_end') @stack('price_th_start') @@ -53,7 +53,7 @@ @stack('price_th_end') @stack('taxes_th_start') - {{ trans_choice('general.taxes', 1) }} + {{ trans_choice('general.taxes', 1) }} @stack('taxes_th_end') @stack('total_th_start') diff --git a/resources/views/sales/invoices/item.blade.php b/resources/views/sales/invoices/item.blade.php index 741358feb..2b2d61b50 100644 --- a/resources/views/sales/invoices/item.blade.php +++ b/resources/views/sales/invoices/item.blade.php @@ -51,7 +51,7 @@ @stack('name_td_end') @stack('quantity_td_start') - + @stack('quantity_input_start') + @stack('tax_id_input_start') {{ Form::multiSelectAddNewGroup('tax_id', '', '', $taxes, '', [ 'data-item' => 'tax_id',