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

Merge pull request #5390 from devansh-webkul/master 

CSS Added And Aligned Counts #5389
This commit is contained in:
Devansh 2021-12-06 16:08:07 +05:30 committed by GitHub
parent 79f235da29 7c4ff4aac3
commit 9f71f0cb45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 83 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Ui/publishable/assets/css/ui.css 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=cb07561b86778a65eece",
"/css/ui.css": "/css/ui.css?id=87c15a3e7af4ab272377"
"/css/ui.css": "/css/ui.css?id=5aaf2dcbf5a491595a39"
}

21
packages/Webkul/Ui/src/Resources/assets/sass/includes/components.scss vendored
View File

@ -1,4 +1,4 @@
@import "main/mixins";
@import 'main/mixins';
.grid-container {
display: block;
@ -43,6 +43,11 @@
}
}
.records-count-container {
float: right;
padding: 10px;
}
@media only screen and (max-width: 1192px) {
.datagrid-filters {
flex-direction: column;
@ -108,7 +113,6 @@
width: 100px;
}
}
}
.grid-dropdown-header {
@ -119,7 +123,7 @@
width: 200px;
border: 2px solid $control-border-color;
border-radius: 3px;
color: #8E8E8E;
color: #8e8e8e;
padding: 0px 5px 0px 5px;
.arrow-icon-down {
@ -162,7 +166,7 @@
display: flex;
flex-direction: row;
align-items: center;
background: #E7E7E7;
background: #e7e7e7;
font-size: 14px;
height: 40px;
color: #000311;
@ -181,7 +185,7 @@
.control {
padding-right: 10px;
border-left: 0;
border-right: 2px solid #C7C7C7;
border-right: 2px solid #c7c7c7;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
border-top-left-radius: 0;
@ -214,4 +218,9 @@
}
}
}
}
.records-count-container {
float: left;
padding: 10px;
}
}

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

@ -33,62 +33,62 @@
<div class="datagrid-filters">
<div class="filter-left">
@if (isset($results['extraFilters']['channels']))
<div class="dropdown-filters per-page">
<div class="control-group">
<select class="control" id="channel-switcher" name="channel"
onchange="reloadPage('channel', this.value)">
<option value="all" {{ ! isset($channel) ? 'selected' : '' }}>
{{ __('admin::app.admin.system.all-channels') }}
</option>
@foreach ($results['extraFilters']['channels'] as $channelModel)
<option
value="{{ $channelModel->code }}"
{{ (isset($channel) && ($channelModel->code) == $channel) ? 'selected' : '' }}>
{{ core()->getChannelName($channelModel) }}
<div class="dropdown-filters per-page">
<div class="control-group">
<select class="control" id="channel-switcher" name="channel"
onchange="reloadPage('channel', this.value)">
<option value="all" {{ ! isset($channel) ? 'selected' : '' }}>
{{ __('admin::app.admin.system.all-channels') }}
</option>
@endforeach
</select>
@foreach ($results['extraFilters']['channels'] as $channelModel)
<option
value="{{ $channelModel->code }}"
{{ (isset($channel) && ($channelModel->code) == $channel) ? 'selected' : '' }}>
{{ core()->getChannelName($channelModel) }}
</option>
@endforeach
</select>
</div>
</div>
</div>
@endif
@if (isset($results['extraFilters']['locales']))
<div class="dropdown-filters per-page">
<div class="control-group">
<select class="control" id="locale-switcher" name="locale"
onchange="reloadPage('locale', this.value)">
<option value="all" {{ ! isset($locale) ? 'selected' : '' }}>
{{ __('admin::app.admin.system.all-locales') }}
</option>
@foreach ($locales as $localeModel)
<option
value="{{ $localeModel->code }}" {{ (isset($locale) && ($localeModel->code) == $locale) ? 'selected' : '' }}>
{{ $localeModel->name }}
<div class="dropdown-filters per-page">
<div class="control-group">
<select class="control" id="locale-switcher" name="locale"
onchange="reloadPage('locale', this.value)">
<option value="all" {{ ! isset($locale) ? 'selected' : '' }}>
{{ __('admin::app.admin.system.all-locales') }}
</option>
@endforeach
</select>
@foreach ($locales as $localeModel)
<option
value="{{ $localeModel->code }}" {{ (isset($locale) && ($localeModel->code) == $locale) ? 'selected' : '' }}>
{{ $localeModel->name }}
</option>
@endforeach
</select>
</div>
</div>
</div>
@endif
@if (isset($results['extraFilters']['customer_groups']))
<div class="dropdown-filters per-page">
<div class="control-group">
<select class="control" id="customer-group-switcher" name="customer_group"
onchange="reloadPage('customer_group', this.value)">
<option value="all" {{ ! isset($customer_group) ? 'selected' : '' }}>
{{ __('admin::app.admin.system.all-customer-groups') }}
</option>
@foreach ($results['extraFilters']['customer_groups'] as $customerGroupModel)
<option
value="{{ $customerGroupModel->id }}"
{{ (isset($customer_group) && ($customerGroupModel->id) == $customer_group) ? 'selected' : '' }}>
{{ $customerGroupModel->name }}
<div class="dropdown-filters per-page">
<div class="control-group">
<select class="control" id="customer-group-switcher" name="customer_group"
onchange="reloadPage('customer_group', this.value)">
<option value="all" {{ ! isset($customer_group) ? 'selected' : '' }}>
{{ __('admin::app.admin.system.all-customer-groups') }}
</option>
@endforeach
</select>
@foreach ($results['extraFilters']['customer_groups'] as $customerGroupModel)
<option
value="{{ $customerGroupModel->id }}"
{{ (isset($customer_group) && ($customerGroupModel->id) == $customer_group) ? 'selected' : '' }}>
{{ $customerGroupModel->name }}
</option>
@endforeach
</select>
</div>
</div>
</div>
@endif
</div>
</div>
@ -107,12 +107,6 @@
</div>
</div>
<div class="filter-left records-count-container">
<span class="datagrid-count">
{{ $results['records']->total() }} {{ __('admin::app.admin.system.records-found') }}
</span>
</div>
<div class="filter-right">
<div class="dropdown-filters per-page">
<div class="control-group">
@ -265,6 +259,12 @@
</span>
</div>
<div class="records-count-container">
<span class="datagrid-count">
{{ $results['records']->total() }} {{ __('admin::app.admin.system.records-found') }}
</span>
</div>
<table class="table">
@include('ui::datagrid.partials.mass-action-header')

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-core.js 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

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

@ -1,6 +1,6 @@
{
"/js/velocity.js": "/js/velocity.js?id=49b29efa452a8942811a",
"/js/velocity-core.js": "/js/velocity-core.js?id=5c0fe2bf195ee94576fd",
"/js/velocity.js": "/js/velocity.js?id=8b7c2449a002be2a8c5c",
"/js/velocity-core.js": "/js/velocity-core.js?id=fdfafddb0d317a775f6d",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=66726fc86635262209cf"
"/css/velocity.css": "/css/velocity.css?id=2434338ae6b54d9794a9"
}

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

@ -962,6 +962,11 @@
margin-bottom: 40px;
}
.records-count-container {
float: right;
padding: 10px;
}
#datagrid-filters {
width: 100%;
margin-bottom: 20px;

5
packages/Webkul/Velocity/src/Resources/assets/sass/components/rtl.scss vendored
View File

@ -412,6 +412,11 @@ body {
.account-content {
.account-layout {
.account-table-content {
.records-count-container {
float: left;
padding: 10px;
}
#datagrid-filters {
.filter-left {
.icon-wrapper {