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

Fixed some layout issues with admin

This commit is contained in:
Prashant Singh 2019-03-12 18:31:15 +05:30
parent d2836b50ab
commit ec19630b22
6 changed files with 52 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
View File

@ -17,6 +17,8 @@ class CustomerDataGrid extends DataGrid
protected $sortOrder = 'desc'; //asc or desc
protected $itemsPerPage = 10;
public function prepareQueryBuilder()
{
$queryBuilder = DB::table('customers as custs')

1
packages/Webkul/Admin/src/Resources/assets/sass/_variables.scss vendored
View File

@ -1,6 +1,7 @@
// Body
$brand-color: #0041FF;
$border-color: rgba(162, 162, 162, 0.2);
$background-color: #f8f9fa;
// Typography
$font-family: 'Montserrat', sans-serif;

91
packages/Webkul/Admin/src/Resources/assets/sass/app.scss vendored
View File

@ -13,6 +13,7 @@ body {
font-weight: 500;
position: static;
min-height: 100%;
width: 100%;
}
::-webkit-scrollbar {
@ -93,49 +94,10 @@ body {
}
}
.close-nav-aside {
display: block;
position: absolute;
top: 36px;
left: 260px;
height: 45px;
width: 45px;
padding: 10px;
text-align: center;
border: 1px solid $border-color;
border-radius: 50%;
cursor: pointer;
}
.open-nav-aside {
display: none;
position: absolute;
top: 36px;
left: 68px;
height: 45px;
width: 45px;
padding: 10px;
text-align: center;
border: 1px solid $border-color;
border-radius: 50%;
cursor: pointer;
}
.close-nav-aside:hover, .open-nav-aside:hover {
background: $brand-color;
}
.open-nav-aside, .close-nav-aside {
.icon {
height: 24px;
width: 24px;
}
}
.navbar-left {
position: absolute;
top: 60px;
bottom: 0;
position: sticky;
top: 0;
// bottom: 0;
width: 90px;
padding-top: 20px;
height: auto;
@ -143,6 +105,8 @@ body {
z-index: 2;
ul.menubar {
// padding-bottom: 60px;
li.menu-item {
height: 90px;
padding: 10px 5px;
@ -161,6 +125,21 @@ body {
}
}
}
.open-nav-aside {
position: fixed;
bottom: 0;
left: 0;
width: 90px;
padding: 18px;
text-align: center;
border: 1px solid $border-color;
.icon {
height: 24px;
width: 24px;
}
}
}
.content-container {
@ -171,7 +150,12 @@ body {
right: 0;
left: 0;
bottom: 0px;
overflow-y: auto;
min-height: calc(100% - 60px);
width: 100%;
.inner-section {
height: 100%;
}
.aside-nav {
width: 280px;
@ -179,12 +163,31 @@ body {
top: 60px;
bottom: 0;
border-right: 1px solid $border-color;
background: #f8f9fa;
background: $background-color;
padding-top: 10px;
padding-bottom: 10px;
z-index: 4;
ul {
overflow-y: auto;
height: 90%;
}
.close-nav-aside {
width: 100%;
padding: 20px;
text-align: center;
border: 1px solid $border-color;
.icon {
height: 24px;
width: 24px;
}
}
.close-nav-aside:hover {
background: white;
cursor: pointer;
}
a {

18
packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php
View File

@ -32,28 +32,10 @@
<div class="close-nav-aside">
<i class="icon angle-left-icon close-icon"></i>
</div>
<div class="open-nav-aside">
<i class="icon angle-left-icon close-icon"></i>
</div>
</div>
@push('scripts')
<script>
$(document).ready(function() {
$(".close-nav-aside").on('click', function(e) {
$('.content-wrapper').css("margin-left", "0px");
$('.aside-nav').css('display', 'none');
$('.open-nav-aside').css('display', 'block');
$('.close-nav-aside').css('display', 'none');
});
$(".open-nav-aside").on('click', function(e) {
$('.content-wrapper').css("margin-left", "305px");
$('.aside-nav').css('display', '');
$('.open-nav-aside').css('display', 'none');
$('.close-nav-aside').css('display', 'block');
});
});
</script>
@endpush

4
packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php
View File

@ -11,7 +11,7 @@
@endforeach
</ul>
<div class="open-nav-aside">
{{-- <div class="open-nav-aside">
<i class="icon angle-right-icon open-icon"></i>
</div>
</div> --}}
</div>

81
packages/Webkul/Admin/src/Resources/views/layouts/system.php
View File

@ -1,81 +0,0 @@
<?php
return [
[
'key' => 'sales',
'name' => 'Sales',
'sort' => 1
], [
'key' => 'sales.carriers',
'name' => 'Shipping Methods',
'sort' => 1,
], [
'key' => 'sales.carriers.free',
'name' => 'Free Shipping',
'sort' => 1,
'fields' => [
[
'name' => 'title',
'title' => 'Title',
'type' => 'text',
'validation' => 'required',
'channel_based' => false,
'locale_based' => true
], [
'name' => 'description',
'title' => 'Description',
'type' => 'textarea',
'channel_based' => false,
'locale_based' => true
], [
'name' => 'active',
'title' => 'Status',
'type' => 'select',
'options' => [
[
'title' => 'Active',
'value' => true
], [
'title' => 'Inactive',
'value' => false
]
],
'validation' => 'required'
]
]
], [
'key' => 'sales.carriers.flatrate',
'name' => 'Flat Rate Shipping',
'sort' => 2,
'fields' => [
[
'name' => 'title',
'title' => 'Title',
'type' => 'text',
'validation' => 'required',
'channel_based' => true,
'locale_based' => true
], [
'name' => 'description',
'title' => 'Description',
'type' => 'textarea',
'channel_based' => true,
'locale_based' => false
], [
'name' => 'active',
'title' => 'Status',
'type' => 'select',
'options' => [
[
'title' => 'Active',
'value' => true
], [
'title' => 'Inactive',
'value' => false
]
],
'validation' => 'required'
]
]
]
];