Merge pull request #1232 from batuhawk/master
Overflows and tags updated
This commit is contained in:
commit
5373e89429
5
public/css/custom.css
vendored
5
public/css/custom.css
vendored
@ -115,6 +115,11 @@ button:focus
|
||||
overflow-y: hidden !important;
|
||||
}
|
||||
|
||||
.overflow-x-hidden
|
||||
{
|
||||
overflow-x: hidden !important;
|
||||
}
|
||||
|
||||
.overflow-y-scroll
|
||||
{
|
||||
overflow-y: scroll !important;
|
||||
|
16
public/css/element.css
vendored
16
public/css/element.css
vendored
@ -2605,13 +2605,14 @@
|
||||
}
|
||||
|
||||
.select-tax .el-select .el-select__tags {
|
||||
width: unset !important;
|
||||
width: 179px !important;
|
||||
max-width: unset !important;
|
||||
top: 24px;
|
||||
flex-wrap: unset;
|
||||
}
|
||||
|
||||
:first-of-type.select-tax .el-select span:first-of-type {
|
||||
width: 125px !important;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.select-tax .el-select span:last-of-type {
|
||||
@ -15458,17 +15459,6 @@
|
||||
padding-left: 6px !important;
|
||||
}
|
||||
|
||||
.el-select .el-select__input
|
||||
{
|
||||
margin-left: unset !important;
|
||||
}
|
||||
|
||||
.select-tax .el-select .el-select__tags
|
||||
{
|
||||
width: unset !important;
|
||||
max-width: unset !important;
|
||||
}
|
||||
|
||||
.select-tax .el-input--prefix .el-input__inner {
|
||||
padding-left: 23px !important;
|
||||
}
|
||||
|
@ -46,7 +46,7 @@
|
||||
|
||||
$placeholder = json_encode([
|
||||
'name' => trans('general.form.enter', ['field' => trans('general.name')]),
|
||||
'type' => trans('general.form.enter', ['field' => trans_choice('general.types', 1)]),
|
||||
'type' => trans('general.form.select.field', ['field' => trans_choice('general.types', 1)]),
|
||||
'width' => trans('general.form.enter', ['field' => trans('general.width')]),
|
||||
'sort' => trans('general.form.enter', ['field' => trans('general.sprt')])
|
||||
]);
|
||||
|
@ -32,7 +32,7 @@
|
||||
@endpermission
|
||||
</li>
|
||||
</ul>
|
||||
<div class="ml-auto left-menu-toggle-position overflow-y-hidden">
|
||||
<div class="ml-auto left-menu-toggle-position overflow-hidden">
|
||||
<div class="sidenav-toggler d-none d-xl-block left-menu-toggle" data-action="sidenav-unpin" data-target="#sidenav-main">
|
||||
<div class="sidenav-toggler-inner">
|
||||
<i class="sidenav-toggler-line"></i>
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
<div class="col-md-12 mb-4">
|
||||
{!! Form::label('items', trans_choice('general.items', 2), ['class' => 'form-control-label']) !!}
|
||||
<div class="table-responsive overflow-y-scroll">
|
||||
<div class="table-responsive overflow-y-scroll overflow-x-hidden">
|
||||
<table class="table table-bordered" id="items">
|
||||
<thead class="thead-light">
|
||||
<tr class="d-flex flex-nowrap">
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
<div class="col-md-12 mb-4">
|
||||
{!! Form::label('items', trans_choice('general.items', 2), ['class' => 'control-label']) !!}
|
||||
<div class="table-responsive overflow-y-scroll">
|
||||
<div class="table-responsive overflow-y-scroll overflow-x-hidden">
|
||||
<table class="table table-bordered" id="items">
|
||||
<thead class="thead-light">
|
||||
<tr class="d-flex flex-nowrap">
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
<div class="col-md-12 mb-4">
|
||||
{!! Form::label('items', trans_choice($text_override['items'], 2), ['class' => 'form-control-label']) !!}
|
||||
<div class="table-responsive overflow-y-scroll">
|
||||
<div class="table-responsive overflow-y-scroll overflow-x-hidden">
|
||||
<table class="table table-bordered" id="items">
|
||||
<thead class="thead-light">
|
||||
<tr class="d-flex flex-nowrap">
|
||||
@ -65,7 +65,10 @@
|
||||
|
||||
@stack('add_item_td_start')
|
||||
<tr class="row" id="addItem">
|
||||
<td class="col-md-1 action-column border-right-0 border-bottom-0"><button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i></button></td>
|
||||
<td class="col-md-1 action-column border-right-0 border-bottom-0">
|
||||
<button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
|
||||
</button>
|
||||
</td>
|
||||
<td class="col-md-11 text-right border-bottom-0"></td>
|
||||
</tr>
|
||||
@stack('add_item_td_end')
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
<div class="col-md-12 mb-4">
|
||||
{!! Form::label('items', trans_choice($text_override['items'], 2), ['class' => 'control-label']) !!}
|
||||
<div class="table-responsive overflow-y-scroll">
|
||||
<div class="table-responsive overflow-y-scroll overflow-x-hidden">
|
||||
<table class="table table-bordered" id="items">
|
||||
<thead class="thead-light">
|
||||
<tr class="d-flex flex-nowrap">
|
||||
|
Loading…
x
Reference in New Issue
Block a user