+
@inject ('priceHelper', 'Webkul\Product\Product\Price')
@@ -34,37 +33,37 @@
@endif
@endif
-
+ {{--
$45.00
- 10% Off
-
+ 10% Off --}}
-
-
-
+
+@else
+ @if(!is_null($customer))
+
+ {{ __('shop::app.products.write-review-btn') }}
+
+ @endif
@endif
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/flash.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/flash.vue
index f4c3c2ab3..665700d27 100644
--- a/packages/Webkul/Ui/src/Resources/assets/js/components/flash.vue
+++ b/packages/Webkul/Ui/src/Resources/assets/js/components/flash.vue
@@ -1,7 +1,7 @@
-
{{ flash.message }}
+
{{ flash.message }}
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss
index afe55ad04..ef8f97015 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss
@@ -1,5 +1,6 @@
$font-color: #3a3a3a;
$brand-color: #0041FF;
+$info-color: #204d74;
$danger-color: #FC6868;
$success-color: #4CAF50;
$warning-color: #FFC107;
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
index 0325a8463..58e16a504 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
@@ -513,6 +513,10 @@ h2 {
background: $danger-color;
}
+ &.alert-info {
+ background: $info-color;
+ }
+
&.alert-success {
background: $success-color;
}
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css
index fa93efd98..380af5e74 100644
--- a/public/themes/default/assets/css/shop.css
+++ b/public/themes/default/assets/css/shop.css
@@ -97,6 +97,63 @@
height: 32px;
}
+.product-card .product-image {
+ max-height: 350px;
+ max-width: 280px;
+ margin-bottom: 10px;
+ background: #F2F2F2;
+}
+
+.product-card .product-image img {
+ display: block;
+ width: 100%;
+}
+
+.product-card .product-name {
+ margin-bottom: 14px;
+ width: 100%;
+ color: #242424;
+}
+
+.product-card .product-name a {
+ color: #242424;
+}
+
+.product-card .product-description {
+ display: none;
+}
+
+.product-card .product-ratings {
+ width: 100%;
+}
+
+.product-card .product-ratings .icon {
+ width: 16px;
+ height: 16px;
+}
+
+.product-card .cart-wish-wrap {
+ display: -webkit-inline-box;
+ display: -ms-inline-flexbox;
+ display: inline-flex;
+ -webkit-box-pack: start;
+ -ms-flex-pack: start;
+ justify-content: flex-start;
+ -webkit-box-align: center;
+ -ms-flex-align: center;
+ align-items: center;
+ height: 40px;
+}
+
+.product-card .cart-wish-wrap .addtocart {
+ margin-right: 10px;
+ text-transform: uppercase;
+}
+
+.product-card .cart-wish-wrap .add-to-wishlist {
+ margin-top: 5px;
+}
+
.product-grid-4 {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(235px, 1fr));
@@ -139,56 +196,6 @@
}
}
-.product-card .product-image {
- max-height: 350px;
- max-width: 280px;
- margin-bottom: 10px;
- background: #F2F2F2;
-}
-
-.product-card .product-image img {
- display: block;
- width: 100%;
-}
-
-.product-card .product-name {
- margin-bottom: 14px;
- width: 100%;
- color: #242424;
-}
-
-.product-card .product-name a {
- color: #242424;
-}
-
-.product-card .product-description {
- display: none;
-}
-
-.product-card .product-ratings {
- width: 100%;
-}
-
-.product-card .product-ratings .icon {
- width: 16px;
- height: 16px;
-}
-
-.product-card .cart-fav-seg {
- display: -webkit-inline-box;
- display: -ms-inline-flexbox;
- display: inline-flex;
- -webkit-box-align: center;
- -ms-flex-align: center;
- align-items: center;
-}
-
-.product-card .cart-fav-seg .addtocart {
- margin-right: 10px;
- text-transform: uppercase;
- white-space: nowrap;
-}
-
.add-to-wishlist .wishlist-icon:hover {
background-image: url("../images/wishadd.svg");
}
@@ -227,7 +234,7 @@
text-align: left;
}
-.account-head .account-edit {
+.account-head .account-action {
font-size: 17px;
margin-top: 1%;
color: #0031F0;
@@ -2332,94 +2339,90 @@ section.review .review-layouter {
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
- -ms-flex-flow: row;
- flex-flow: row;
- margin-top: 20px;
+ -ms-flex-direction: row;
+ flex-direction: row;
}
-section.review .review-layouter .product-info .image {
- border: 1px solid red;
-}
-
-section.review .review-layouter .product-info .image img {
+section.review .review-layouter .product-info .product-image img {
+ display: block;
height: 280px;
width: 280px;
}
-section.review .review-layouter .product-info .heading {
+section.review .review-layouter .product-info .product-name {
margin-top: 20px;
}
-section.review .review-layouter .product-info .heading span {
+section.review .review-layouter .product-info .product-name span {
font-size: 24px;
}
-section.review .review-layouter .product-info .price {
+section.review .review-layouter .product-info .product-price {
margin-top: 10px;
}
-section.review .review-layouter .product-info .price .pro-price {
+section.review .review-layouter .product-info .product-price .pro-price {
font-size: 24px;
color: #FF6472;
}
-section.review .review-layouter .product-info .price .pro-price-not {
+section.review .review-layouter .product-info .product-price .pro-price-not {
margin-left: 10px;
color: #A5A5A5;
}
-section.review .review-layouter .product-info .price .offer {
+section.review .review-layouter .product-info .product-price .offer {
margin-left: 10px;
}
-section.review .review-layouter .review-info {
+section.review .review-layouter .review-form {
margin-left: 20px;
width: 49%;
}
-section.review .review-layouter .review-info .heading {
+section.review .review-layouter .review-form .heading {
margin-top: 10px;
}
-section.review .review-layouter .review-info .heading .btn.btn-primary.right {
+section.review .review-layouter .review-form .heading .btn.btn-primary.right {
float: right;
margin-top: -10px;
}
-section.review .review-layouter .review-info .rating {
+section.review .review-layouter .review-form .rating {
margin-top: 25px;
color: #A5A5A5;
}
-section.review .review-layouter .review-info .rating span {
+section.review .review-layouter .review-form .rating span {
display: inline;
}
-section.review .review-layouter .review-info .stars {
+section.review .review-layouter .review-form .stars {
width: 270px;
display: inline-block;
}
-section.review .review-layouter .review-info .stars label.star {
+section.review .review-layouter .review-form .stars label.star {
font-size: 36px;
color: #d4d4d4;
-webkit-transition: all .2s;
transition: all .2s;
}
-section.review .review-layouter .review-info .stars label.star:before {
+section.review .review-layouter .review-form .stars label.star:before {
content: '\2605';
}
-section.review .review-layouter .review-info .write-review {
+section.review .review-layouter .review-form .write-review {
margin-top: 25px;
}
-section.review .review-layouter .review-info .write-review .control-group {
+section.review .review-layouter .review-form .write-review .control-group {
margin-bottom: 0px;
}
-section.review .review-layouter .review-info .write-review .control-group textarea {
+section.review .review-layouter .review-form .write-review .control-group textarea {
margin-top: 5px;
border: 2px solid #E8E8E8;
border-radius: 3px;
@@ -2427,11 +2430,11 @@ section.review .review-layouter .review-info .write-review .control-group textar
height: 120px;
}
-section.review .review-layouter .review-info .submit-button {
+section.review .review-layouter .review-form .submit-button {
margin-top: 10px;
}
-section.review .review-layouter .review-info .submit-button button {
+section.review .review-layouter .review-form .submit-button button {
background: #0031F0;
font-size: 14px;
color: #F2F2F2;
@@ -2441,7 +2444,7 @@ section.review .review-layouter .review-info .submit-button button {
border: none;
}
-section.review .review-layouter .review-info .review-detail {
+section.review .review-layouter .review-form .review-detail {
height: 150px;
border: 1px solid firebrick;
margin-top: 30px;
@@ -2454,18 +2457,18 @@ section.review .review-layouter .review-info .review-detail {
flex-direction: row;
}
-section.review .review-layouter .review-info .review-detail .rating-review {
+section.review .review-layouter .review-form .review-detail .rating-review {
margin-top: 40px;
margin-left: 20px;
width: 48%;
}
-section.review .review-layouter .review-info .review-detail .rating-review .avg-rating-count span {
+section.review .review-layouter .review-form .review-detail .rating-review .avg-rating-count span {
font-size: 34px;
text-align: center;
}
-section.review .review-layouter .review-info .review-detail .rating-calculate .progress-only {
+section.review .review-layouter .review-form .review-detail .rating-calculate .progress-only {
width: 20px;
border: 1px solid blue;
}