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

Merged With Master

This commit is contained in:
devansh bawari 2021-07-27 10:04:04 +05:30
parent 465e376cff 8459b1633c
commit e3569e6ae9
8 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=1b33967c7fd8d475476b",
"/js/ui.js": "/js/ui.js?id=4abc33791463568de076",
"/css/ui.css": "/css/ui.css?id=87c15a3e7af4ab272377"
}

2
packages/Webkul/Ui/src/Resources/assets/js/components/datagrid/datagrid-plus.vue
View File

@ -173,7 +173,7 @@
<select
class="filter-column-select control"
v-model="filterColumn"
v-on:click="
v-on:change="
getColumnOrAlias(filterColumn)
"
>

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

@ -134,7 +134,7 @@
<li>
<div class="control-group">
<select class="filter-column-select control" v-model="filterColumn"
v-on:click="getColumnOrAlias(filterColumn)">
v-on:change="getColumnOrAlias(filterColumn)">
<option selected disabled>{{ __('ui::app.datagrid.column') }}</option>
@foreach($results['columns'] as $column)
@if(isset($column['filterable']) && $column['filterable'])

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

File diff suppressed because one or more lines are too long

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

@ -1,5 +0,0 @@
{
"/js/velocity.js": "/js/velocity.js?id=bb427adb33496ed9e8ce",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=66e65f379f6b0c2a0d1c"
}

1
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -502,7 +502,6 @@
.customer-options{
top: 40px;
float: right;
height: 100%;
padding: 20px;
width: 200px !important;

2
packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss vendored
View File

@ -490,8 +490,10 @@ header #search-form > *:focus {
ul {
width: 100%;
height: 100%;
white-space: nowrap;
display: inline-flex;
background-color: $link-color;
overflow-x: auto;
li {
a {