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

conflict

This commit is contained in:
rahul shukla 2018-10-11 16:23:23 +05:30
parent 5a71127c4e
commit 247bb41812
4 changed files with 37 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1081,6 +1081,11 @@ section.slider-block {
float: right;
}
.side-menu-title-active::after {
content: url(../images//arrow-up.svg);
float: right;
}
li {
width: 100%;
margin-left: 0%;

29
packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php
View File

@ -1,5 +1,5 @@
<ul class="account-side-menu">
<div class="side-menu-title" id="side-menu-title">
<div class="side-menu-title-active" id="side-menu-title" onclick="sayHello()">
Menu
</div>
@ -11,3 +11,30 @@
</ul>
@push('scripts')
<script>
function sayHello(){
alert('hello');
var sideMenuTitle = document.getElementById("side-menu-title");
if(sideMenuTitle == 'side-menu-title-active'){
console.log('dffd');
sideMenuTitle.classList.remove("side-menu-title-active");
sideMenuTitle.classList.add("side-menu-title");
}else{
sideMenuTitle.classList.remove("side-menu-title");
sideMenuTitle.classList.add("side-menu-title-active");
}
}
</script>
@endpush

50
packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
View File

@ -60,56 +60,6 @@
<script type="text/javascript" src="{{ bagisto_asset('js/shop.js') }}"></script>
<script type="text/javascript" src="{{ asset('vendor/webkul/ui/assets/js/ui.js') }}"></script>
{{-- For JS that requires onload property --}}
<script>
window.onload = function () {
//header
var hamMenu = document.getElementById("hammenu");
var search = document.getElementById("search");
var sort = document.getElementById("sort");
var filter = document.getElementById("filter");
var searchResponsive = document.getElementsByClassName('search-responsive')[0];
var sortLimit = document.getElementsByClassName('reponsive-sorter-limiter')[0];
var layerFilter = document.getElementsByClassName('responsive-layred-filter')[0];
var navResponsive = document.getElementsByClassName('responsive-nav')[0];
search.addEventListener("click", header);
hamMenu.addEventListener("click", header);
//clone nav menu
};
// for responsive header
function header(){
var className = document.getElementById(this.id).className;
if(className === 'icon search-icon' ){
search.classList.remove("search-icon");
search.classList.add("icon-menu-close");
hamMenu.classList.remove("icon-menu-close");
hamMenu.classList.add("sortable-icon");
searchResponsive.style.display = 'block';
navResponsive.style.display = 'none';
}else if(className === 'icon sortable-icon'){
hamMenu.classList.remove("sortable-icon");
hamMenu.classList.add("icon-menu-close");
search.classList.remove("icon-menu-close");
search.classList.add("search-icon");
searchResponsive.style.display = 'none';
navResponsive.style.display = 'block';
}else{
search.classList.remove("icon-menu-close");
search.classList.add("search-icon");
hamMenu.classList.remove("icon-menu-close");
hamMenu.classList.add("sortable-icon");
searchResponsive.style.display = 'none';
navResponsive.style.display = 'none';
}
}
</script>
@stack('scripts')
</body>

4
public/themes/default/assets/css/shop.css vendored
View File

@ -1688,6 +1688,10 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
content: url(../images/arrow-down.svg);
float: right;
}
.account-content .account-side-menu .side-menu-title-active::after {
content: url(../images//arrow-up.svg);
float: right;
}
.account-content .account-side-menu li {
width: 100%;
margin-left: 0%;