merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Final fixed layout issue in order and downloadable grid at customer #3472

This commit is contained in:
Akhtar Khan 2020-07-16 17:12:39 +05:30
parent 8c1561c142
commit de60d86b56
6 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/scout.php
View File

@ -15,7 +15,7 @@ return [
|
*/
'driver' => env('SCOUT_DRIVER', 'null'),
'driver' => env('SCOUT_DRIVER', null),
/*
|--------------------------------------------------------------------------

15
packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
View File

@ -1,4 +1,3 @@
<div class="table">
<datagrid-filters></datagrid-filters>
@ -11,7 +10,7 @@
<div class="grid-container">
<div class="datagrid-filters" id="datagrid-filters">
<div class="filter-left filter-left-mobile">
<div class="filter-left">
<div class="search-filter">
<input type="search" id="search-field" class="control" placeholder="{{ __('ui::app.datagrid.search') }}" v-model="searchValue" v-on:keyup.enter="searchCollection(searchValue)" />
@ -21,8 +20,8 @@
</div>
</div>
<div class="filter-right filter_right_mobile">
<div class="dropdown-filters per-page item_per_page">
<div class="filter-right">
<div class="dropdown-filters per-page">
<div class="control-group">
<label class="per-page-label" for="perPage">
{{ __('ui::app.datagrid.items-per-page') }}
@ -38,7 +37,7 @@
</div>
</div>
<div class="dropdown-filters filter_for_order">
<div class="dropdown-filters">
<div class="dropdown-toggle">
<div class="grid-dropdown-header">
<span class="name">{{ __('ui::app.datagrid.filter') }}</span>
@ -168,7 +167,7 @@
</span>
</div>
<table class="table mobile-table">
<table class="table">
@include('ui::datagrid.partials.mass-action-header')
@include('ui::datagrid.partials.default-header')
@ -738,8 +737,4 @@
});
</script>
@endpush
</div>

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=ed145773873729794808",
"/js/velocity.js": "/js/velocity.js?id=e7cb83bdbcabf25995cc",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=02ba781fdeb5ad5b10eb"
"/css/velocity.css": "/css/velocity.css?id=a6ba44ccf2158be5a1d9"
}

11
packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss vendored
View File

@ -54,16 +54,15 @@
.table {
width: 90%;
margin-bottom: 1rem;
margin-top: 68px;
color: #212529;
}
.mobile-table {
margin-top: 68px;
}
.item_per_page {
.per-page {
position: absolute;
margin-top: 66px;
margin-right: -1px;
@ -71,12 +70,12 @@
width: 151px;
}
.filter-left-mobile {
.filter-left {
position: relative;
margin-right: -6px!important;
}
.filter_for_order {
.dropdown-filters {
margin-left: 15px;
}