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

Merge pull request #2830 from shubhwebkul/master 

customer accordian view and file picker view in velocity
This commit is contained in:
Jitendra Singh 2020-04-06 10:55:49 +05:30 committed by GitHub
parent 4b59e7e746 0e06a114af
commit 9d357e466d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 67 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=08fbd43328947b542230",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=9b4ec44f8853ba8be2db"
"/css/velocity.css": "/css/velocity.css?id=5d5625586d1faefa5201"
}

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

@ -1084,6 +1084,57 @@
padding: 6px 12px;
}
}
.accordian .accordian-header {
padding: 10px 0;
font-weight: 600;
}
.image-wrapper {
width: 100%;
margin-top: 10px;
margin-bottom: 20px;
display: inline-block;
.image-item {
width: 200px;
height: 200px;
position: relative;
border-radius: 3px;
margin-right: 20px;
background: #f8f9fa;
margin-bottom: 20px;
display: inline-block;
background-position: 50%;
background-repeat: no-repeat;
background-image: url(/vendor/webkul/ui/assets/images/placeholder-icon.svg);
.remove-image {
left: 0;
bottom: 0;
width: 100%;
color: #fff;
padding: 10px;
cursor: pointer;
margin-bottom: 0;
text-align: center;
position: absolute;
margin-right: 20px;
border-radius: 0 0 4px 4px;
text-shadow: 0 1px 2px rgba(0,0,0,.24);
background-image: linear-gradient(-180deg,rgba(0,0,0,.08),rgba(0,0,0,.24));
}
input {
display: none;
}
img.preview {
width: 100%;
height: 100%;
}
}
}
}
.account-items-list {

22
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/index.blade.php
View File

@ -15,16 +15,22 @@
@push('scripts')
<script>
$(document).ready(function() {
let sidebarHeight = $('.customer-sidebar').css('height');
let contentHeight = $('.account-layout').css('height');
let updateHeight = () => {
let sidebarHeight = $('.customer-sidebar').css('height');
let contentHeight = $('.account-layout').css('height');
sidebarHeight = parseInt(sidebarHeight.substring(0, sidebarHeight.length - 2));
contentHeight = parseInt(contentHeight.substring(0, contentHeight.length - 2));
sidebarHeight = parseInt(sidebarHeight.substring(0, sidebarHeight.length - 2));
contentHeight = parseInt(contentHeight.substring(0, contentHeight.length - 2));
let height = sidebarHeight > contentHeight ? sidebarHeight + 30 : contentHeight;
height = height + "px";
let height = sidebarHeight > contentHeight ? sidebarHeight + 30 : contentHeight;
height = height + "px";
$('.account-content').css('height', height);
$('.account-content').css('height', height);
}
updateHeight();
$('.accordian-header').click(updateHeight);
});
</script>
@endpush
@endpush