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

Merge pull request #108 from bagisto/rahul 

Rahul
This commit is contained in:
JItendra Singh 2018-10-30 18:18:39 +05:30 committed by GitHub
parent af892b918a a677d5d553
commit 864efbce17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1136,15 +1136,15 @@ section.slider-block {
float: none;
}
// .nav li ul {
// padding-left: 20px;
// }
.nav li > .icon{
float: right;
display: block;
}
.icon.icon-arrow-down {
margin-right: 5px;
}
.nav li .left{
height: 16px;
width: 16px;
@ -1777,7 +1777,7 @@ section.product-detail {
margin-right: 0px;
max-width: none;
width: auto;
height: auto;
// height: auto;
.loader {
margin-left: 47%;
@ -2059,18 +2059,6 @@ section.cart {
width: 100%;
float: none;
.cart-item-list {
.item {
.item-image {
height: 90px;
width: 90px;
}
.item-details .misc {
margin-left: -105px;
}
}
}
.misc-controls {
position: relative;
top: 200px;
@ -2090,12 +2078,26 @@ section.cart {
@media only screen and (max-width: 560px){
section.cart {
.cart-content {
.left-side .misc-controls {
display: block;
top: 180px;
.left-side {
.cart-item-list {
.item {
.item-image {
height: 90px;
width: 90px;
}
.item-details .misc {
margin-left: -105px;
}
}
}
div {
margin-top: 10px;
.misc-controls {
display: block;
top: 180px;
div {
margin-top: 10px;
}
}
}
@ -2905,7 +2907,6 @@ section.review {
//customer account page responsive layout
@media only screen and (max-width: 770px) {
.account-content {
flex-direction: column;
@ -2977,6 +2978,10 @@ section.review {
display: block;
}
}
.address-holder {
justify-content: center;
}
}
}
@ -3019,7 +3024,6 @@ section.review {
width: 100%;
}
}
}
.sale-container {

17
packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
View File

@ -68,13 +68,13 @@
<span class="control-error" v-if="errors.has('qty[{{$item->id}}]')">@{{ errors.first('qty') }}</span>
<span class="remove">
<a href="{{ route('shop.checkout.cart.remove', $item->id) }}">{{ __('shop::app.checkout.cart.remove-link') }}</a></span>
<a href="{{ route('shop.checkout.cart.remove', $item->id) }}" onclick="removeLink('Do you really want to do this?')">{{ __('shop::app.checkout.cart.remove-link') }}</a></span>
<span class="towishlist">
@if($item->parent_id != 'null' ||$item->parent_id != null)
<a href="{{ route('shop.movetowishlist', $item->id) }}">{{ __('shop::app.checkout.cart.move-to-wishlist') }}</a>
<a href="{{ route('shop.movetowishlist', $item->id) }}" onclick="removeLink('Do you really want to do this?')">{{ __('shop::app.checkout.cart.move-to-wishlist') }}</a>
@else
<a href="{{ route('shop.movetowishlist', $item->child->id) }}">{{ __('shop::app.checkout.cart.move-to-wishlist') }}</a>
<a href="{{ route('shop.movetowishlist', $item->child->id) }}" onclick="removeLink('Do you really want to do this?')">{{ __('shop::app.checkout.cart.move-to-wishlist') }}</a>
@endif
</span>
</div>
@ -132,4 +132,13 @@
@endif
</section>
@endsection
@endsection
@push('scripts')
<script>
function removeLink(message){
if(!confirm(message))
event.preventDefault();
}
</script>
@endpush

16
packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
View File

@ -174,11 +174,13 @@
</div>
<div class="search-responsive mt-10">
<div class="search-content">
<i class="icon icon-search mt-10"></i>
<input class="search mt-5">
<i class="icon icon-menu-back right mt-10"></i>
</div>
<form role="search" action="{{ route('shop.search.index') }}" method="GET" style="display: inherit;">
<div class="search-content">
<i class="icon icon-search mt-10"></i>
<input type="search" name="term" class="search mt-5">
<i class="icon icon-menu-back right mt-10"></i>
</div>
</form>
{{-- <div class="search-content">
<i class="icon icon-search mt-10"></i>
@ -190,7 +192,7 @@
@push('scripts')
<script>
window.onload = function() {
$(document).ready(function() {
var hamMenu = document.getElementById("hammenu");
var search = document.getElementById("search");
var searchResponsive = document.getElementsByClassName('search-responsive')[0];
@ -224,6 +226,6 @@
navResponsive.style.display = 'none';
}
}
}
});
</script>
@endpush