From d48493225c43c263c8675bc7c085deb780f46207 Mon Sep 17 00:00:00 2001 From: "shubhammehrotra.symfony@webkul.com" Date: Tue, 21 Jan 2020 21:30:55 +0530 Subject: [PATCH] fixed drawer issues --- .../publishable/assets/css/velocity.css | 314 +++++++++++------- .../publishable/assets/js/velocity.js | 134 +++++++- .../Seeders/VelocityMetaDataSeeder.php | 2 +- .../assets/js/UI/components/carousel.vue | 3 +- .../js/UI/components/image-magnifier.vue | 2 +- .../assets/js/UI/components/wishlist.vue | 20 ++ .../Velocity/src/Resources/assets/js/app.js | 9 + .../src/Resources/assets/sass/app.scss | 4 +- .../Resources/assets/sass/components/UI.scss | 112 ------- .../Resources/assets/sass/components/app.scss | 12 +- .../assets/sass/components/footer.scss | 9 + .../assets/sass/components/home.scss | 8 +- .../assets/sass/components/media.scss | 184 +++++++++- .../assets/sass/components/product-view.scss | 16 +- .../assets/sass/components/shared.scss | 11 +- .../Resources/views/UI/particals.blade.php | 95 ++++-- .../UI/shared/responsive-header.blade.php | 171 ---------- .../UI/shared/responsive-sidebar.blade.php | 88 ----- .../Resources/views/home/category.blade.php | 19 +- .../views/home/customer-reviews.blade.php | 2 +- .../views/home/featured-products.blade.php | 22 +- .../home/in-progress/categories.blade.php | 52 --- .../in-progress/popular-products.blade.php | 12 - .../home/in-progress/product-modal.blade.php | 24 -- .../recently-viewed-products.blade.php | 146 -------- .../views/home/new-products.blade.php | 69 +++- .../layouts/footer/footer-links.blade.php | 2 +- .../footer/newsletter-subscription.blade.php | 2 +- .../views/layouts/header/index.blade.php | 2 +- .../layouts/header/nav-menu/navmenu.blade.php | 20 +- .../Resources/views/layouts/master.blade.php | 2 +- .../products/list/recently-viewed.blade.php | 4 +- .../views/products/reviews/create.blade.php | 6 +- .../Resources/views/products/view.blade.php | 175 +++++----- .../views/products/view/gallery.blade.php | 29 +- .../products/view/related-products.blade.php | 51 ++- .../views/products/view/reviews.blade.php | 4 +- .../views/products/view/small-view.blade.php | 2 +- .../views/products/wishlist.blade.php | 28 +- 39 files changed, 897 insertions(+), 970 deletions(-) create mode 100644 packages/Webkul/Velocity/src/Resources/assets/js/UI/components/wishlist.vue delete mode 100644 packages/Webkul/Velocity/src/Resources/views/UI/shared/responsive-header.blade.php delete mode 100644 packages/Webkul/Velocity/src/Resources/views/UI/shared/responsive-sidebar.blade.php delete mode 100644 packages/Webkul/Velocity/src/Resources/views/home/in-progress/categories.blade.php delete mode 100644 packages/Webkul/Velocity/src/Resources/views/home/in-progress/popular-products.blade.php delete mode 100644 packages/Webkul/Velocity/src/Resources/views/home/in-progress/product-modal.blade.php delete mode 100644 packages/Webkul/Velocity/src/Resources/views/home/in-progress/recently-viewed-products.blade.php diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css index a7ea9fe33..eec2a1e9c 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css @@ -811,118 +811,6 @@ top: 8px; } -.nav-container { - position: fixed; - width: 300px !important; - height: 100vh; - background-color: white; - margin-left: -16px; - z-index: 2; -} - -.nav-container .wrapper { - margin-top: 15px; -} - -.nav-container .wrapper .category-title { - display: table; - width: 100%; - padding-left: 10px; - margin: 13px 0px 13px 0px; - display: none; -} - -.nav-container .wrapper .category-title > i { - display: table-cell; - vertical-align: middle; - font-size: 26px; -} - -.nav-container .wrapper .category-title span { - display: table-cell; - vertical-align: top; - font-size: 20px; -} - -.nav-container .wrapper .category-title span i { - float: left !important; - margin: 2px 2px 0px 0px !important; -} - -.nav-container .wrapper .greeting { - display: table; - width: 100%; - padding-left: 10px; - margin: 13px 0px 13px 0px; -} - -.nav-container .wrapper .greeting > i { - display: table-cell; - vertical-align: middle; - font-size: 26px; -} - -.nav-container .wrapper .greeting span { - display: table-cell; - vertical-align: top; - font-size: 20px; -} - -.nav-container .wrapper .greeting span i { - float: right !important; - margin: 2px 20px 0px 0px !important; -} - -.nav-container .wrapper .offers { - color: rgba(0, 0, 0, 0.83); - line-height: 20px; - font-weight: 530; - border-top: 1px solid rgba(0, 0, 0, 0.24); - border-bottom: 1px solid rgba(0, 0, 0, 0.24); -} - -.nav-container .wrapper .offers li { - font-size: 16px; - margin: 16px 0px 16px 15px; -} - -.nav-container .wrapper .layered-category { - font-weight: 501; - letter-spacing: 0.2px; - margin: 16px 0px 0px 0px; -} - -.nav-container .wrapper .layered-category .category-icon { - width: 36px; - height: 20px; - padding-left: 12px; - display: inline-block; -} - -.nav-container .wrapper .layered-category .category-icon img { - width: 100%; - height: 100%; - vertical-align: text-top; -} - -.nav-container .wrapper .layered-category li { - margin: 18px 0px 18px 5px; - font-size: 17px; -} - -.nav-container .wrapper .layered-category li a span { - color: black; - font-size: 14px; - margin: 16px 0px 16px 15px !important; - font-weight: 400px; -} - -.nav-container .wrapper .layered-category li i { - float: right; - font-size: 16px; - margin: 3px 20px 0px 0px; -} - .review-page-container { padding: 20px; } @@ -1157,6 +1045,14 @@ margin-top: 10px; } +.product-card-new .card-body .product-name, +.product-card-new .card-body .product-rating { + width: 15rem; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + .product-card-new .product-price .sticker { display: block; } @@ -1579,7 +1475,7 @@ .account-content .sidebar .customer-sidebar .navigation li:hover, .account-content .sidebar .customer-sidebar .navigation li.active { color: #28557B; - background-color: #F7F7F9; + background-color: #ECECEC; } .account-content .sidebar .customer-sidebar .navigation li i.icon { @@ -2583,7 +2479,7 @@ } .recetly-viewed-products-wrapper { - padding: 10px; + padding: 2px; } /* @author Shubham Mehrotra */ @@ -2788,6 +2684,14 @@ header #search-form > *:focus { vertical-align: middle; } +.product-policy-container .product-policy-wrapper:nth-of-type(1) { + padding-left: 0px; +} + +.product-policy-container .product-policy-wrapper:nth-last-of-type(1) { + padding-right: 0px; +} + /* product policy section */ /* category with custom option */ .category-with-custom-options img { @@ -3021,7 +2925,6 @@ header #search-form > *:focus { .main-content-wrapper .main-category { padding: 8px 15px; border-top: 1px solid #CCCCCC; - border-bottom: 1px solid #CCCCCC; } .main-content-wrapper .content-list { @@ -3255,9 +3158,14 @@ body::after { .footer .footer-content .newsletter-subscription .newsletter-wrapper .social-icons .within-circle { background: #4d7ea8; + margin-right: 2px; border: 1px solid rgba(255, 255, 255, 0.52); } +.footer .footer-content .newsletter-subscription .newsletter-wrapper .social-icons .within-circle:hover { + opacity: 0.5; +} + .footer .footer-content .newsletter-subscription .newsletter-wrapper .social-icons img { background: #4d7ea8; border: 1px solid rgba(255, 255, 255, 0.52); @@ -3299,6 +3207,10 @@ body::after { color: rgba(255, 255, 255, 0.83); } +.footer .footer-content > .row .footer-rt-content { + padding-right: 0px; +} + .footer .footer-content > .row .footer-rt-content .row > div { width: 100%; display: block; @@ -3349,6 +3261,10 @@ body::after { color: rgba(255, 255, 255, 0.52); } +.footer .footer-content .footer-statics .software-description { + padding-left: 0px; +} + .footer .footer-content .footer-statics .software-description p { font-size: 14px; } @@ -3996,6 +3912,13 @@ body::after { padding: 10px 0 !important; } +.small-card-container .card-body .product-name { + width: 17rem; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + .small-card-container .sticker, .small-card-container .regular-price { display: none; @@ -4219,8 +4142,8 @@ button[disabled] { font-size: 14px; } -.max-height-300 { - max-height: 300px; +.max-height-350 { + max-height: 350px; } .border-normal { @@ -4229,7 +4152,9 @@ button[disabled] { .product-detail { padding-top: 20px; - margin-bottom: 60px; + margin-bottom: 20px; + padding-left: 0 !important; + padding-right: 0 !important; } .product-detail .magnifier > img { @@ -4388,10 +4313,16 @@ button[disabled] { .product-detail #product-form .form-container .left { top: 60px; + padding: 0px; position: -webkit-sticky; position: sticky; } +.product-detail #product-form .form-container .left .product-image-group > div { + margin: 0; + padding: 0; +} + .product-detail #product-form .form-container .right .swatch-container { margin-top: 10px; display: inline-block; @@ -4455,8 +4386,12 @@ button[disabled] { max-height: 300px; } +.related-products { + margin-bottom: 60px; +} + .vc-small-screen { - display: none; + display: none !important; } @media only screen and (max-width: 1100px) { @@ -4490,6 +4425,23 @@ button[disabled] { } @media only screen and (max-width: 992px) { + .vc-small-screen { + display: block !important; + } + .main-content-wrapper { + position: relative; + } + .main-content-wrapper .vc-header { + top: 0; + margin: 0; + padding: 0; + z-index: 100; + position: -webkit-sticky; + position: sticky; + background-color: #FFFFFF; + -webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); + } .main-content-wrapper .vc-header > div { display: none; } @@ -4502,13 +4454,13 @@ button[disabled] { max-height: 50px; } .main-content-wrapper .vc-header > div.vc-small-screen .hamburger-wrapper { - display: table; + display: inline-block; height: 50px; } .main-content-wrapper .vc-header > div.vc-small-screen .hamburger-wrapper .hamburger { + top: 12px; font-size: 24px; - display: table-cell; - vertical-align: middle; + position: relative; } .main-content-wrapper .vc-header > div.vc-small-screen .right-vc-header { text-align: right; @@ -4522,9 +4474,6 @@ button[disabled] { #top { display: none; } - #top + header { - display: none; - } .product-card-new .cart-wish-wrap .wishlist-icon { text-align: left; } @@ -4600,6 +4549,117 @@ button[disabled] { .vc-small-screen .searchbar { padding-left: 100px !important; } + .carousel-products.vc-full-screen { + display: none; + } + .carousel-products.vc-small-screen { + display: block !important; + } + .reviews-container .review-wrapper, + .reviews-container .review-wrapper:nth-of-type(1), + .reviews-container .review-wrapper:nth-last-of-type(1), + .reviews-container .review-wrapper:nth-last-of-type(2) { + padding: 0px; + } + .reviews-container .review-wrapper:not(:last-child) { + margin-bottom: 10px; + } + .product-policy-wrapper { + padding: 0px !important; + } + .product-policy-wrapper:not(:last-child) { + margin-bottom: 10px; + } + .main-product-image { + display: none; + } + .product-detail #product-form .form-container .left { + top: 0px; + padding: 0px; + position: relative; + margin-bottom: 20px; + } + .product-detail #product-form .form-container .right { + padding: 0px; + } + .product-detail .customer-rating > .row > div { + margin-bottom: 30px; + } + .review-page-container > div:not(:last-child) { + margin-bottom: 20px; + } + .nav-container { + top: 0px; + left: 0px; + z-index: 10; + height: 100vh; + position: fixed; + font-size: 16px; + overflow-y: scroll; + -webkit-box-shadow: 0 2px 8px 0; + box-shadow: 0 2px 8px 0; + width: 300px !important; + background-color: #FFFFFF; + } + .nav-container .wrapper .category-title { + width: 100%; + display: table; + padding-left: 10px; + display: none; + margin: 13px 0px 13px 0px; + } + .nav-container .wrapper .category-title > i { + font-size: 26px; + display: table-cell; + vertical-align: middle; + } + .nav-container .wrapper .category-title span { + font-size: 20px; + display: table-cell; + vertical-align: top; + } + .nav-container .wrapper .category-title span i { + float: left !important; + margin: 2px 2px 0px 0px !important; + } + .nav-container .wrapper .greeting { + width: 100%; + display: table; + } + .nav-container .wrapper .greeting > i { + font-size: 26px; + display: table-cell; + vertical-align: middle; + } + .nav-container .wrapper .greeting span { + font-size: 20px; + display: table-cell; + vertical-align: top; + } + .nav-container .wrapper ul { + color: black; + border-top: 1px solid #CCCCCC; + } + .nav-container .wrapper ul li { + font-size: 16px; + padding: 10px 0px 10px 20px; + } + .nav-container .wrapper ul li:hover { + background-color: #ECECEC; + } + .nav-container .wrapper ul li .category-logo { + width: 18px; + height: 18px; + margin-right: 5px; + display: inline-block; + } + .nav-container .wrapper ul li .rango-arrow-right { + float: right; + padding-right: 15px; + } + .nav-container .drawer-section { + padding: 15px; + } } /* fallback */ @@ -12884,7 +12944,7 @@ body { #top #account + .account-modal { top: 40px; right: 10px; - z-index: 100; + z-index: 101; height: -webkit-max-content; height: -moz-max-content; height: max-content; @@ -13329,9 +13389,9 @@ header .dropdown-menu-large .dropdown-footer .checkout-link { } #nav-menu .navbar .category-dropdown li.category-list a:hover { - background-color: #F7F7F9; color: #28557B; text-decoration: none; + background-color: #F7F7F9; } #nav-menu .navbar .category-dropdown li.category-list .child-container { diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js index 5b7de091f..f4a8a0078 100644 --- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js +++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js @@ -1111,6 +1111,7 @@ __WEBPACK_IMPORTED_MODULE_0_vue___default.a.component("vue-slider", __webpack_re __WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('modal-component', __webpack_require__(45)); __WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('quantity-btn', __webpack_require__(48)); __WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('sidebar-component', __webpack_require__(51)); +__WEBPACK_IMPORTED_MODULE_0_vue___default.a.component("wishlist-component", __webpack_require__(73)); __WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('carousel-component', __webpack_require__(54)); __WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('child-sidebar', __webpack_require__(57)); __WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('card-list-content', __webpack_require__(60)); @@ -1205,6 +1206,14 @@ $(document).ready(function () { eventBus.$emit('onFormError'); } }); + }, + + isMobile: function isMobile() { + if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) { + return true; + } else { + return false; + } } } }); @@ -35822,7 +35831,6 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); // // // -// /* harmony default export */ __webpack_exports__["default"] = ({ props: ['id', 'loop', 'timeout', 'autoplay', 'addClass', 'slidesCount', 'slidesPerPage', 'navigationEnabled', 'paginationEnabled'], @@ -35860,8 +35868,7 @@ var render = function() { perPage: parseInt(_vm.slidesPerPage), loop: _vm.loop == "true" ? true : false, autoplay: _vm.autoplay == "true" ? true : false, - autoplayTimeout: _vm.timeout ? parseInt(_vm.timeout) : 2000, - "slide-click": "slideClicked" + autoplayTimeout: _vm.timeout ? parseInt(_vm.timeout) : 2000 } }, [ @@ -36758,8 +36765,8 @@ var render = function() { staticClass: "main-product-image", attrs: { src: _vm.src, - id: "active-product-image", - "data-zoom-image": _vm.src + "data-zoom-image": _vm.src, + id: "active-product-image" } }) ]) @@ -36786,5 +36793,122 @@ if (false) { // removed by extract-text-webpack-plugin +/***/ }), +/* 71 */, +/* 72 */, +/* 73 */ +/***/ (function(module, exports, __webpack_require__) { + +var disposed = false +var normalizeComponent = __webpack_require__(1) +/* script */ +var __vue_script__ = __webpack_require__(74) +/* template */ +var __vue_template__ = __webpack_require__(75) +/* template functional */ +var __vue_template_functional__ = false +/* styles */ +var __vue_styles__ = null +/* scopeId */ +var __vue_scopeId__ = null +/* moduleIdentifier (server only) */ +var __vue_module_identifier__ = null +var Component = normalizeComponent( + __vue_script__, + __vue_template__, + __vue_template_functional__, + __vue_styles__, + __vue_scopeId__, + __vue_module_identifier__ +) +Component.options.__file = "src/Resources/assets/js/UI/components/wishlist.vue" + +/* hot reload */ +if (false) {(function () { + var hotAPI = require("vue-hot-reload-api") + hotAPI.install(require("vue"), false) + if (!hotAPI.compatible) return + module.hot.accept() + if (!module.hot.data) { + hotAPI.createRecord("data-v-ac965700", Component.options) + } else { + hotAPI.reload("data-v-ac965700", Component.options) + } + module.hot.dispose(function (data) { + disposed = true + }) +})()} + +module.exports = Component.exports + + +/***/ }), +/* 74 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); +// +// +// +// +// +// +// +// +// +// + +/* harmony default export */ __webpack_exports__["default"] = ({ + props: ['active'], + data: function data() { + return { + isActive: this.active + }; + } +}); + +/***/ }), +/* 75 */ +/***/ (function(module, exports, __webpack_require__) { + +var render = function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c( + "i", + { + class: "material-icons", + on: { + mouseover: function($event) { + _vm.isActive ? (_vm.isActive = !_vm.isActive) : "" + }, + mouseout: function($event) { + _vm.active !== "" && !_vm.isActive + ? (_vm.isActive = !_vm.isActive) + : "" + } + } + }, + [ + _vm._v( + "\n\n " + + _vm._s(_vm.isActive ? "favorite_border" : "favorite") + + "\n" + ) + ] + ) +} +var staticRenderFns = [] +render._withStripped = true +module.exports = { render: render, staticRenderFns: staticRenderFns } +if (false) { + module.hot.accept() + if (module.hot.data) { + require("vue-hot-reload-api") .rerender("data-v-ac965700", module.exports) + } +} + /***/ }) /******/ ]); \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php index 6835df29e..3e8d4c766 100644 --- a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php +++ b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php @@ -24,7 +24,7 @@ class VelocityMetaDataSeeder extends Seeder 'subscription_bar_content' => '
', - 'product_policy' => '
Free Shippingon Order $20 or More
ProductReplace & Return Available
ProductExchange and EMI Available
', + 'product_policy' => '
Free Shippingon Order $20 or More
ProductReplace & Return Available
ProductExchange and EMI Available
', ]); DB::table('locales')->where('code', 'en')->update([ diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue index 142b5d2b9..8e33bb2f0 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue +++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue @@ -10,8 +10,7 @@ (navigationEnabled == 'hide') ? 'navigation-hide' : '', (paginationEnabled == 'hide') ? 'pagination-hide' : '', addClass - ]" - slide-click="slideClicked"> + ]"> diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/wishlist.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/wishlist.vue new file mode 100644 index 000000000..20dae9977 --- /dev/null +++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/wishlist.vue @@ -0,0 +1,20 @@ + + + \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/app.js b/packages/Webkul/Velocity/src/Resources/assets/js/app.js index c1928d147..50a8d8a67 100755 --- a/packages/Webkul/Velocity/src/Resources/assets/js/app.js +++ b/packages/Webkul/Velocity/src/Resources/assets/js/app.js @@ -22,6 +22,7 @@ Vue.component("vue-slider", require("vue-slider-component")); Vue.component('modal-component', require('./UI/components/modal')); Vue.component('quantity-btn', require('./UI/components/quantity-btn')); Vue.component('sidebar-component', require('./UI/components/sidebar')); +Vue.component("wishlist-component", require("./UI/components/wishlist")); Vue.component('carousel-component', require('./UI/components/carousel')); Vue.component('child-sidebar', require('./UI/components/child-sidebar')); Vue.component('card-list-content', require('./UI/components/card-list')); @@ -117,6 +118,14 @@ $(document).ready(function () { } }); }, + + isMobile() { + if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) { + return true + } else { + return false + } + } } }); diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss index 8013fc4fe..f7f97bdc5 100755 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss @@ -210,7 +210,7 @@ body { top: 40px; right: 10px; - z-index: 100; + z-index: 101; height: max-content; width: 290px !important; position: absolute !important; @@ -653,9 +653,9 @@ header { } &:hover { - background-color: #F7F7F9; color: #28557B; text-decoration: none; + background-color: $light-background; } } diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss index 041d267fa..37ca88db7 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss @@ -121,116 +121,4 @@ top: 8px; } } -} - -.nav-container { - position: fixed; - width: 300px !important; - height: 100vh; - background-color: white; - margin-left: -16px; - z-index: 2; - - .wrapper { - margin-top : 15px; - - .category-title { - display: table; - width: 100%; - padding-left: 10px; - margin : 13px 0px 13px 0px; - display: none; - > i { - display: table-cell; - vertical-align: middle; - font-size: 26px; - } - - span { - display: table-cell; - vertical-align: top; - font-size: 20px; - i { - float: left !important; - margin: 2px 2px 0px 0px !important; - } - } - } - - .greeting { - display: table; - width: 100%; - padding-left: 10px; - margin : 13px 0px 13px 0px; - > i { - display: table-cell; - vertical-align: middle; - font-size: 26px; - } - - span { - display: table-cell; - vertical-align: top; - font-size: 20px; - i { - float: right !important; - margin: 2px 20px 0px 0px !important; - } - - - } - } - - .offers { - color: rgba(0,0,0,0.83); - line-height: 20px; - font-weight: 530; - border-top: 1px solid rgba(0,0,0,0.24); - border-bottom: 1px solid rgba(0,0,0,0.24); - - li { - font-size: 16px; - margin : 16px 0px 16px 15px; - } - } - - .layered-category{ - font-weight: 501; - letter-spacing: 0.2px; - margin: 16px 0px 0px 0px; - - .category-icon { - width: 36px; - height: 20px; - padding-left: 12px; - display: inline-block; - - img { - width: 100%; - height: 100%; - vertical-align: text-top; - } - } - - li { - margin: 18px 0px 18px 5px; - font-size: 17px; - a { - span { - color: black; - font-size: 14px; - margin : 16px 0px 16px 15px !important; - font-weight: 400px; - } - } - - - i { - float: right; - font-size: 16px; - margin: 3px 20px 0px 0px; - } - } - } - } } \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss index 55545539d..e646072bc 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss @@ -244,6 +244,14 @@ > div:last-child { margin-top: 10px; } + + .product-name, + .product-rating { + width: 15rem; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } } .product-price { @@ -705,7 +713,7 @@ &:hover, &.active { color: $light-link-color; - background-color: $light-background; + background-color: $border-light; } i { @@ -1816,5 +1824,5 @@ } .recetly-viewed-products-wrapper { - padding: 10px; + padding: 2px; } diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss index 903ab6d70..d769014a4 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss @@ -48,9 +48,14 @@ .within-circle { background: #4d7ea8; + margin-right: 2px; border: 1px solid rgba(255, 255, 255, 0.52); } + .within-circle:hover { + opacity: 0.5; + } + img { background: #4d7ea8; border: 1px solid rgba(255, 255, 255, 0.52); @@ -97,6 +102,8 @@ } .footer-rt-content { + padding-right: 0px; + .row { > div { width: 100%; @@ -148,6 +155,8 @@ .footer-statics { .software-description { + padding-left: 0px; + p { @extend .clr-dark; diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss index 482a4f73a..fb908f266 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss @@ -211,6 +211,13 @@ header #search-form > *:focus { } } } + + .product-policy-wrapper:nth-of-type(1) { + padding-left: 0px; + } + .product-policy-wrapper:nth-last-of-type(1) { + padding-right: 0px; + } } /* product policy section */ @@ -468,7 +475,6 @@ header #search-form > *:focus { .main-category { padding: 8px 15px; border-top: 1px solid $border-common; - border-bottom: 1px solid $border-common; } .content-list { diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss index 78c15f082..a835be7ad 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss @@ -1,5 +1,5 @@ .vc-small-screen { - display: none; + display: none !important; } @media only screen and (max-width: 1100px) { @@ -52,8 +52,22 @@ @media only screen and (max-width: 992px) { $header-height: 50px; + .vc-small-screen { + display: block !important; + } + .main-content-wrapper { + position: relative; + .vc-header { + top: 0; + margin: 0; + padding: 0; + z-index: 100; + position: sticky; + background-color: $white-color; + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); + > div { display: none; } @@ -68,13 +82,13 @@ } .hamburger-wrapper { - display: table; + display: inline-block; height: $header-height; .hamburger { + top: 12px; font-size: 24px; - display: table-cell; - vertical-align: middle; + position: relative; } } @@ -94,14 +108,6 @@ #top { display: none; - - + header { - display: none; - } - - // + .categories-sidebar-container { - // display: none; - // } } .product-card-new { @@ -187,7 +193,6 @@ } .popular-categories-container { - .popular-category-wrapper { padding: 0px; @@ -239,4 +244,157 @@ padding-left: 100px !important; } } + + .carousel-products { + &.vc-full-screen { + display: none; + } + + &.vc-small-screen { + display: block !important; + } + } + + .reviews-container { + .review-wrapper, + .review-wrapper:nth-of-type(1), + .review-wrapper:nth-last-of-type(1), + .review-wrapper:nth-last-of-type(2) { + padding: 0px; + } + + .review-wrapper:not(:last-child) { + margin-bottom: 10px; + } + } + + .product-policy-wrapper { + padding: 0px !important; + } + + .product-policy-wrapper:not(:last-child) { + margin-bottom: 10px; + } + + .main-product-image { + display: none; + } + + .product-detail { + #product-form { + .form-container { + .left { + top: 0px; + padding: 0px; + position: relative; + margin-bottom: 20px; + } + + .right { + padding: 0px; + } + } + } + + .customer-rating { + > .row { + > div { + margin-bottom: 30px; + } + } + } + } + + .review-page-container { + > div:not(:last-child) { + margin-bottom: 20px; + } + } + + .nav-container { + top: 0px; + left: 0px; + z-index: 10; + height: 100vh; + position: fixed; + font-size: 16px; + overflow-y: scroll; + box-shadow: 0 2px 8px 0; + width: 300px !important; + background-color: $white-color; + + .wrapper { + .category-title { + width: 100%; + display: table; + padding-left: 10px; + display: none; + margin : 13px 0px 13px 0px; + + > i { + font-size: 26px; + display: table-cell; + vertical-align: middle; + } + + span { + font-size: 20px; + display: table-cell; + vertical-align: top; + + i { + float: left !important; + margin: 2px 2px 0px 0px !important; + } + } + } + + .greeting { + width: 100%; + display: table; + + > i { + font-size: 26px; + display: table-cell; + vertical-align: middle; + } + + span { + font-size: 20px; + display: table-cell; + vertical-align: top; + } + } + + ul { + color: black; + border-top: 1px solid $border-common; + + li { + font-size: 16px; + padding: 10px 0px 10px 20px; + + &:hover { + background-color: $border-light; + } + + .category-logo { + width: 18px; + height: 18px; + margin-right: 5px; + display: inline-block; + } + + .rango-arrow-right { + float: right; + padding-right: 15px; + } + } + } + } + + .drawer-section { + padding: 15px; + } + } } \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss index f7973f3a1..94aa6aa96 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss @@ -1,6 +1,8 @@ .product-detail { padding-top: 20px; - margin-bottom: 60px; + margin-bottom: 20px; + padding-left: 0 !important; + padding-right: 0 !important; .magnifier { > img { @@ -230,7 +232,15 @@ .left { top: 60px; + padding: 0px; position: sticky; + + .product-image-group { + > div { + margin: 0; + padding: 0; + } + } } .right { @@ -305,3 +315,7 @@ } } +.related-products { + margin-bottom: 60px; +} + diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss index 4c3f189e2..e79a72193 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss @@ -557,6 +557,13 @@ width: 50%; display: inline-block; padding: 10px 0 !important; + + .product-name { + width: 17rem; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } } .sticker, @@ -787,8 +794,8 @@ button[disabled] { font-size: 14px; } -.max-height-300 { - max-height: 300px; +.max-height-350 { + max-height: 350px; } .border-normal { diff --git a/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php b/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php index 3f2ab14a6..b768514d2 100644 --- a/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php @@ -24,9 +24,6 @@ star_border - - {{-- star_border - star --}} @@ -139,31 +136,78 @@
{!! view_render_event('bagisto.shop.layout.header.cart-item.before') !!} - @include('shop::checkout.cart.mini-cart') - {!! view_render_event('bagisto.shop.layout.header.cart-item.after') !!}
- - - - - - - - -@endpush \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/views/UI/shared/responsive-sidebar.blade.php b/packages/Webkul/Velocity/src/Resources/views/UI/shared/responsive-sidebar.blade.php deleted file mode 100644 index 5205738cf..000000000 --- a/packages/Webkul/Velocity/src/Resources/views/UI/shared/responsive-sidebar.blade.php +++ /dev/null @@ -1,88 +0,0 @@ -@php - $velocityContent = app('Webkul\Velocity\Repositories\ContentRepository')->getAllContents(); -@endphp - -
-
-
- - chevron_left - Mens - -
- -
-
    -
  • Top
    • - -
  • Bottom
    • -
-
- -
- perm_identity - - @guest('customer') - {{ __('velocity::app.responsive.header.greeting', ['customer' => 'Guest']) }} - @endguest - - @auth('customer') - {{ __('velocity::app.responsive.header.greeting', ['customer' => auth()->guard('customer')->user()->first_name]) }} - @endauth - cancel - -
- -
-
    - - - @foreach ($velocityContent as $index => $content) -
  • {{ $content->title }}
    • - @endforeach -
-
- -
-
    - @foreach ($categories as $index => $category) -
  • - @if($category->category_icon_path) - - @endif - - {{ $category->name }} - - @if(sizeof($category->children) > 0) - chevron_right - @endif -
    • - @endforeach -
-
-
-
- -@push('scripts') - - - -@endpush \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/views/home/category.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/category.blade.php index 0ef2dbe58..4449154ff 100644 --- a/packages/Webkul/Velocity/src/Resources/views/home/category.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/home/category.blade.php @@ -16,7 +16,7 @@ heading="{{ $categoryDetails->name }}"> -
+
@foreach ($products as $index => $product) - @include ('shop::products.list.card', ['product' => $product]) - @endforeach + +
+
+ + + @foreach ($products as $index => $product) + + @include ('shop::products.list.card', ['product' => $product]) + + @endforeach
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/customer-reviews.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/customer-reviews.blade.php index 935db7e50..3a01c7a75 100644 --- a/packages/Webkul/Velocity/src/Resources/views/home/customer-reviews.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/home/customer-reviews.blade.php @@ -11,7 +11,7 @@
@foreach ($reviews as $key => $review) -
+
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/featured-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/featured-products.blade.php index e1d7fad75..38c8c7880 100644 --- a/packages/Webkul/Velocity/src/Resources/views/home/featured-products.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/home/featured-products.blade.php @@ -9,12 +9,10 @@ @if ($featuredProductsCount)
- -
- +
@endforeach -
+
+ + + @foreach ($featuredProducts as $index => $product) + + + @include ('shop::products.list.card', ['product' => $product]) + + + @endforeach + +
@endif diff --git a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/categories.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/categories.blade.php deleted file mode 100644 index ea464b766..000000000 --- a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/categories.blade.php +++ /dev/null @@ -1,52 +0,0 @@ - - - 'rango-globe', - 'Shoes3' => 'rango-globe', - 'Shoes4' => 'rango-globe', - 'Shoes5' => 'rango-globe', - 'Shoes6' => 'rango-globe', - 'Shoes7' => 'rango-globe', - 'Shoes8' => 'rango-globe', - 'Shoes18' => 'rango-globe', - 'Shoes19' => 'rango-globe', - 'Men' => 'rango-cloth', - 'Women' => 'rango-t-shirt', - 'kids' => 'rango-baby', - 'Lipstick' => 'rango-lipstick', - 'Shoes' => 'rango-shoes', - 'Shop' => 'rango-shop', - "Jewellery" => "rango-neckless", - "Camera" => "rango-camera", - "Travel" => "rango-bag", - ]; - - $slicedCount = (sizeof($categories) - 9); - - $categories = array_slice($categories, $slicedCount); - - $categories['More'] = 'rango-plus'; -?> - -{!! view_render_event('bagisto.shop.home.categories.before') !!} - -
-
- - @foreach ($categories as $categoryName => $icon) -
- - {{ $categoryName }} - -
- - @endforeach -
- - -
- -{!! view_render_event('bagisto.shop.home.categories.after') !!} - - diff --git a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/popular-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/popular-products.blade.php deleted file mode 100644 index f6585d49d..000000000 --- a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/popular-products.blade.php +++ /dev/null @@ -1,12 +0,0 @@ -
- - - - {!! view_render_event('bagisto.shop.popular.products.before') !!} - - - - {!! view_render_event('bagisto.shop.popular.products.after') !!} - - -
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/product-modal.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/product-modal.blade.php deleted file mode 100644 index cc846a856..000000000 --- a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/product-modal.blade.php +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/recently-viewed-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/recently-viewed-products.blade.php deleted file mode 100644 index 3d89fe73e..000000000 --- a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/recently-viewed-products.blade.php +++ /dev/null @@ -1,146 +0,0 @@ -{{--
- -
- -
-

Plants

-
- -
-
- -
-
-

<

-

>

-
-
- -
-

Recently Viewed Product

-
- -
-
- - -
- - @php - $plants = [ - [ - 'actual-price' => 25, - 'star-rating' => 3, - 'review-count' => 25, - 'currency-icon' => '$', - 'selling-price' => 25, - 'product-image' => asset('themes/velocity/assets/images/product1.png'), - 'productName' => 'Flower Pot Potted 1291324', - ], [ - 'actual-price' => 50, - 'star-rating' => 3, - 'review-count' => 25, - 'currency-icon' => '$', - 'selling-price' => 1, - 'product-image' => asset('themes/velocity/assets/images/product2.png'), - 'productName' => 'Flower Pot Potted 1291324', - ], [ - 'actual-price' => 50, - 'star-rating' => 3, - 'review-count' => 25, - 'currency-icon' => '$', - 'selling-price' => 23, - 'product-image' => asset('themes/velocity/assets/images/product3.png'), - 'productName' => 'Flower Pot Potted 1291324', - ], [ - 'actual-price' => 23, - 'star-rating' => 3, - 'review-count' => 0, - 'currency-icon' => '$', - 'selling-price' => 23, - 'product-image' => asset('themes/velocity/assets/images/product4.png'), - 'productName' => 'Flower Pot Potted 1291324', - ], [ - 'actual-price' => 50, - 'star-rating' => 3, - 'review-count' => 25, - 'currency-icon' => '$', - 'selling-price' => 23, - 'product-image' => asset('themes/velocity/assets/images/product1.png'), - 'productName' => 'Flower Pot Potted 1291324', - ], - ]; - - $recentlyReviewed = [ - [ - 'star-rating' => 3, - 'currency-icon' => '$', - 'selling-price' => 25, - 'product-image' => asset('themes/velocity/assets/images/product1.png'), - 'productName' => 'Flower Pot Potted 1291324', - ], [ - 'star-rating' => 3, - 'currency-icon' => '$', - 'selling-price' => 25, - 'product-image' => asset('themes/velocity/assets/images/product1.png'), - 'productName' => 'Flower Pot Potted 1291324', - ], [ - 'star-rating' => 3, - 'currency-icon' => '$', - 'selling-price' => 25, - 'product-image' => asset('themes/velocity/assets/images/product1.png'), - 'productName' => 'Flower Pot Potted 1291324', - ], [ - 'star-rating' => 3, - 'currency-icon' => '$', - 'selling-price' => 25, - 'product-image' => asset('themes/velocity/assets/images/product1.png'), - 'productName' => 'Flower Pot Potted 1291324', - ], - ] - - @endphp - -
- - - @include('shop::home.helper.product-large-cart-view', [ - 'products' => $plants - ]) - - -
- @include('shop::home.helper.product-small-cart-view', [ - 'products' => $recentlyReviewed - ]) -
- -
-
--}} - -@php - $cardCount = 5; -@endphp - -
- - - - {!! view_render_event('bagisto.shop.new-products.before') !!} - -
- @foreach ($products as $index => $product) - @if ($index <= ($cardCount - 1)) - @include ('shop::products.list.card', ['product' => $product]) - @endif - @endforeach - - @include ('shop::products.list.recently-viewed', ['products' => $products]) - -
- - {!! view_render_event('bagisto.shop.new-products.after') !!} - -
\ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/views/home/new-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/new-products.blade.php index 13035f92e..a0f511684 100644 --- a/packages/Webkul/Velocity/src/Resources/views/home/new-products.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/home/new-products.blade.php @@ -11,17 +11,17 @@ {!! view_render_event('bagisto.shop.new-products.before') !!} -
- @if ($showRecentlyViewed) - @push('css') - - @endpush + @if ($showRecentlyViewed) + @push('css') + + @endpush -
+
+
+
+ + + @foreach ($newProducts as $index => $product) + + @include ('shop::products.list.card', [ + 'product' => $product, + 'addToCartBtnClass' => 'small-padding' + ]) + + @endforeach + + +
+ @include ('shop::products.list.recently-viewed', [ 'addClass' => 'col-3 new-products-recent', - 'addClassWrapper' => 'scrollable max-height-300', + 'addClassWrapper' => 'scrollable max-height-350', ]) - @else +
+ @else +
- @endif -
+
+ +
+ + + @foreach ($newProducts as $index => $product) + + @include ('shop::products.list.card', [ + 'product' => $product, + 'addToCartBtnClass' => 'small-padding' + ]) + + @endforeach + +
+ @endif {!! view_render_event('bagisto.shop.new-products.after') !!}
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links.blade.php index 612e8b3fe..0dcdd540d 100644 --- a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links.blade.php @@ -1,4 +1,4 @@ -
+
@include('velocity::layouts.footer.footer-links.footer-left') @include('velocity::layouts.footer.footer-links.footer-middle') @include('velocity::layouts.footer.footer-links.footer-right') diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/newsletter-subscription.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/newsletter-subscription.blade.php index 52f56b780..974677294 100644 --- a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/newsletter-subscription.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/newsletter-subscription.blade.php @@ -3,7 +3,7 @@ || core()->getConfigData('customer.settings.newsletter.subscription') )