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

Merge branch 'AayushBhatt-webkul-my-new' into velocity-1

This commit is contained in:
shubhammehrotra.symfony@webkul.com 2020-01-10 18:42:47 +05:30
parent ca34d5873a acadbbea1f
commit e51dec855f
10 changed files with 140 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php
View File

@ -42,7 +42,7 @@
<div class="sorter">
<label>{{ __('shop::app.products.sort-by') }}</label>
<select onchange="window.location.href = this.value">
<select style="-webkit-appearance: none;" onchange="window.location.href = this.value">
@foreach ($toolbarHelper->getAvailableOrders() as $key => $order)

59
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

@ -1086,6 +1086,10 @@
background-color: #0D2438;
}
.product-card-new:hover #quick-view-btn-container {
display: block;
}
.quantity {
width: 100%;
padding-bottom: 10px;
@ -2360,6 +2364,29 @@
padding: 42px 10px 0 10px;
}
.selective-div {
-webkit-appearance: none;
}
.select-icon-margin {
margin-top: 10px;
margin-left: 96px;
}
.down-icon-position {
position: absolute;
}
.select-icon-show-margin {
margin-left: 35px;
margin-top: 10px;
}
.down-arrow-margin {
margin-left: 75px;
margin-top: 8px;
}
/* @author Shubham Mehrotra */
body {
overflow-x: hidden;
@ -2863,7 +2890,7 @@ header #search-form > *:focus {
body::after {
/* dark overlay layer - visible when we fire .cd-quick-view */
position: fixed;
position: absolute;
top: 0;
left: 0;
width: 100%;
@ -2911,7 +2938,8 @@ body::after {
}
.cd-quick-view .action-buttons {
padding-top: 20px;
padding-top: 10px;
margin-left: 118px;
}
.cd-quick-view .action-buttons > span {
@ -2933,6 +2961,20 @@ body::after {
border: 1px solid red;
}
.ul-shadow {
-webkit-box-shadow: 1px 2px 8px #888888;
box-shadow: 1px 2px 8px #888888;
}
.quick-addtocart-btn {
margin-top: 306px;
margin-left: -82px;
}
.model-display-block {
display: block;
}
.footer {
width: 100%;
background-color: #ffffff;
@ -3667,6 +3709,7 @@ body::after {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
color: #555555;
}
.small-card-container {
@ -3898,6 +3941,18 @@ button[disabled] {
font-family: 'Webkul Rango' !important;
}
.quick-view-name {
font-size: 24px;
}
.quick-view-price {
font-size: 30px;
}
.description-text {
font-size: 14px;
}
.max-height-350 {
max-height: 350px;
}

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

@ -36890,7 +36890,7 @@ var render = function() {
_c("div", { staticClass: "content-list right" }, [
_c(
"ul",
{ staticClass: "no-margin", attrs: { type: "none" } },
{ staticClass: "no-margin ul-shadow", attrs: { type: "none" } },
_vm._l(_vm.headerContent, function(content, index) {
return _c("li", { key: index }, [
content["content_type"] == "link"

2
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue
View File

@ -15,7 +15,7 @@
</div>
<div class="content-list right">
<ul type="none" class="no-margin">
<ul type="none" class="no-margin ul-shadow">
<li v-for="(content, index) in headerContent" :key="index">
<a
v-text="content.title"

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

@ -291,7 +291,7 @@
.product-card-new:hover {
#quick-view-btn-container {
// display: block;
display: block;
}
}
@ -1680,4 +1680,27 @@
.layered-filter-wrapper {
padding: 42px 10px 0 10px;
}
}
.selective-div {
-webkit-appearance: none;
}
.select-icon-margin {
margin-top: 10px;
margin-left: 96px;
}
.down-icon-position {
position: absolute;
}
.select-icon-show-margin {
margin-left: 35px;
margin-top: 10px;
}
.down-arrow-margin {
margin-left: 75px;
margin-top: 8px;
}

21
packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss vendored
View File

@ -543,7 +543,7 @@ header #search-form > *:focus {
body::after {
/* dark overlay layer - visible when we fire .cd-quick-view */
position: fixed;
position: absolute;
top: 0;
left: 0;
width: 100%;
@ -591,7 +591,8 @@ body::after {
}
.action-buttons {
padding-top: 20px;
padding-top: 10px;
margin-left: 118px;
> span {
font-size: 24px;
@ -612,4 +613,18 @@ body::after {
.demo {
border: 1px solid red;
}
}
.ul-shadow {
box-shadow: 1px 2px 8px #888888;
}
.quick-addtocart-btn {
margin-top: 306px;
margin-left: -82px;
}
.model-display-block {
display:block;
}

13
packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss vendored
View File

@ -497,6 +497,7 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
color: #555555;
}
.small-card-container {
@ -734,6 +735,18 @@ button[disabled] {
font-family: 'Webkul Rango' !important;
}
.quick-view-name {
font-size: 24px;
}
.quick-view-price {
font-size: 30px;
}
.description-text {
font-size: 14px;
}
.max-height-350 {
max-height: 350px;
}

1
packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php
View File

@ -38,6 +38,7 @@
class="btn btn-link disable-box-shadow">
<div class="mini-cart-content">
<i class="icon fs16 cell rango-arrow-down down-icon-position down-arrow-margin"></i>
<i class="rango-cart-1 fs24 text-down-3"></i>
<span class="badge" v-text="itemCount"></span>
<span class="fs18 fw6 cart-text">{{ __('velocity::app.minicart.cart') }}</span>

22
packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php
View File

@ -20,10 +20,7 @@
id="quick-view-btn-container"
:name="details"
@click="openQuickView({details: details, event: $event})">
<product-quick-view
v-if="quickViewDetails"
:quick-view-details="quickViewDetails"
></product-quick-view>
<product-quick-view v-if="quickViewDetails" :quick-view-details="quickViewDetails"></product-quick-view>
<span class="rango-zoom-plus"></span>
@ -33,7 +30,7 @@
<script type="text/x-template" id="product-quick-view-template">
<div class="cd-quick-view" v-if="quickView">
<div class="col-lg-6 cd-slider-wrapper">
<div class="col-lg-6 cd-slider-wrapper model-animation">
<ul class="cd-slider" type="none">
<li class="selected">
<img src="{{ $productBaseImage['medium_image_url'] }}" :alt="quickViewDetails.name" />
@ -50,10 +47,10 @@
</div>
<div class="col-lg-6 cd-item-info fs16">
<h2 class="text-nowrap fw6">{{ $product->name }}</h2>
<h2 class="text-nowrap fw6 quick-view-name">{{ $product->name }}</h2>
<div class="product-price fs14">
<h2 class="text-nowrap fw6">{{ $product->price }}</h2>
<h2 class="text-nowrap fw6 quick-view-price">{{ $product->price }}</h2>
</div>
{{-- @TODO --}}
@ -67,12 +64,15 @@
</div>
@endif --}}
<p class="pt20">
<p class="pt14 description-text">
{!! $product->description !!}
</p>
<button type="submit" class="btn btn-add-to-cart quick-addtocart-btn">
<span class="rango-cart-1 fs20"></span>
Add To Cart
</button>
<div class="action-buttons">
<div style="display: inline-block;" class="rango-exchange fs24"></div>
<div style="display: inline-block;" class="rango-heart fs24"></div>
</div>
@ -98,6 +98,7 @@
methods: {
openQuickView: function ({details, event}) {
document.getElementById('quick-view-btn-container').style.display = "block";
if (event) {
event.preventDefault();
event.stopPropagation();
@ -131,6 +132,9 @@
closeQuickView: function () {
this.quickView = false;
this.quickViewDetails = false;
document.getElementById('quick-view-btn-container').style.display = "none";
window.location.reload();
},
changeImage: function (imageIndex) {

20
packages/Webkul/Velocity/src/Resources/views/products/list/toolbar.blade.php
View File

@ -41,24 +41,24 @@
<div class="sorter">
<label>{{ __('shop::app.products.sort-by') }}</label>
<i class="icon fs16 cell rango-arrow-down select-icon-margin down-icon-position"></i>
<select class="selective-div" onchange="window.location.href = this.value">
<select onchange="window.location.href = this.value">
@foreach ($toolbarHelper->getAvailableOrders() as $key => $order)
@foreach ($toolbarHelper->getAvailableOrders() as $key => $order)
<option value="{{ $toolbarHelper->getOrderUrl($key) }}" {{ $toolbarHelper->isOrderCurrent($key) ? 'selected' : '' }}>
{{ __('shop::app.products.' . $order) }}
</option>
<option value="{{ $toolbarHelper->getOrderUrl($key) }}" {{ $toolbarHelper->isOrderCurrent($key) ? 'selected' : '' }}>
{{ __('shop::app.products.' . $order) }}
</option>
@endforeach
@endforeach
</select>
</select>
</div>
<div class="limiter">
<label>{{ __('shop::app.products.show') }}</label>
<select onchange="window.location.href = this.value">
<i class="icon fs16 cell rango-arrow-down select-icon-show-margin down-icon-position"></i>
<select class="selective-div" onchange="window.location.href = this.value" style="width: 57px;">
@foreach ($toolbarHelper->getAvailableLimits() as $limit)