diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css index 3c72f8b51..1154452df 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css @@ -1068,7 +1068,7 @@ } .product-card-new .cart-wish-wrap .wishlist-icon { - height: 32px; + height: 38px; display: table; text-align: right; } @@ -1443,6 +1443,14 @@ margin-left: 15px; } +.cart-details .coupon-container { + margin-top: 20px; +} + +.cart-details .coupon-container .control-error { + padding: 10px 0; +} + .account-content .sidebar { height: 100%; } @@ -1780,7 +1788,8 @@ display: inline-block; } -.custom-form .row { +.custom-form .form-field { + padding: 0; margin-bottom: 30px; } @@ -2494,8 +2503,45 @@ padding: 2px; } +.bottom-toolbar .pagination .page-item { + padding: 0 10px; +} + +.bottom-toolbar .pagination a { + color: unset !important; + text-decoration: none !important; +} + +.bottom-toolbar .pagination a i { + top: 2px; + font-size: 18px; + position: relative; +} + +.bottom-toolbar .pagination .angle-left-icon, +.bottom-toolbar .pagination .angle-right-icon { + speak: none; + line-height: 1; + font-style: normal; + font-weight: normal; + text-transform: none; + font-variant: normal; + -webkit-font-smoothing: antialiased; + font-family: 'Webkul Rango' !important; + background: unset; +} + +.bottom-toolbar .pagination .angle-right-icon::before { + content: "\E908"; +} + +.bottom-toolbar .pagination .angle-left-icon::before { + content: "\E907"; +} + /* @author Shubham Mehrotra */ body { + display: none; overflow-x: hidden; scroll-behavior: smooth; } @@ -3129,15 +3175,6 @@ body::after { background-color: #4d7ea8; } -.footer .footer-content .newsletter-subscription .newsletter-wrapper { - display: flex; - display: -webkit-box; - display: -ms-flexbox; - -ms-flex-pack: justify; - -webkit-box-pack: justify; - justify-content: space-between; -} - .footer .footer-content .newsletter-subscription .newsletter-wrapper input.subscribe-field { width: 300px; border: none; @@ -4480,9 +4517,23 @@ button[disabled] { display: table-cell; vertical-align: middle; } + .main-content-wrapper .vc-header > div.vc-small-screen .right-vc-header .badge-wrapper { + top: -2px; + left: -7px; + position: relative; + } + .main-content-wrapper .vc-header > div.vc-small-screen .right-vc-header .badge-wrapper .badge { + z-index: 10; + border-radius: 50%; + position: absolute; + background: #26A37C; + } #top { display: none; } + .product-card-new { + max-width: 16rem; + } .product-card-new .cart-wish-wrap .wishlist-icon { text-align: left; } @@ -4518,6 +4569,10 @@ button[disabled] { .footer .footer-content .newsletter-subscription { padding: 10px 20px; } + .footer .footer-content .newsletter-subscription .newsletter-wrapper { + margin: 0; + padding: 0; + } .footer .footer-content .newsletter-subscription .newsletter-wrapper input.subscribe-field { width: 200px; } @@ -4601,19 +4656,73 @@ button[disabled] { .customer-rating > .row > div:not(:last-child) { margin-bottom: 20px; } + .auth-content.form-container > .container { + margin: 0; + width: 100%; + } + .auth-content.form-container > .container > div:first-child { + padding: 0; + } + .auth-content.form-container > .container > div:first-child .body { + padding: 20px; + } + .category-page-wrapper .layered-filter-wrapper { + display: none; + } + .category-page-wrapper .category-container { + margin: 0; + margin-top: 20px; + padding-left: 0px !important; + padding-right: 0px !important; + } + .category-page-wrapper .category-container > div { + padding: 0 10px; + } + .category-page-wrapper .category-container .filters-container { + left: 0px; + top: -15px; + padding: 0; + width: 100%; + position: absolute; + padding-bottom: 10px; + -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.21); + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.21); + } + .category-page-wrapper .category-container .filters-container .toolbar-wrapper > div.col-4 { + margin: 0; + padding: 0; + display: table; + text-align: center; + } + .category-page-wrapper .category-container .filters-container .toolbar-wrapper > div.col-4 * { + display: table-cell; + vertical-align: middle; + } + .category-page-wrapper .category-container .filters-container .toolbar-wrapper > div.col-4 a { + text-align: center; + display: inline-block; + } + .category-page-wrapper .category-container .filters-container .toolbar-wrapper > div.col-4 span { + left: 5px; + position: relative; + } .nav-container { top: 0px; left: 0px; - z-index: 10; + width: 100%; + z-index: 9999; height: 100vh; position: fixed; font-size: 16px; overflow-y: scroll; + padding-right: 15px; -webkit-box-shadow: 0 2px 8px 0; box-shadow: 0 2px 8px 0; - width: 300px !important; background-color: #FFFFFF; } + .nav-container .wrapper { + position: relative; + } .nav-container .wrapper .category-title { width: 100%; display: table; @@ -4636,8 +4745,13 @@ button[disabled] { margin: 2px 2px 0px 0px !important; } .nav-container .wrapper .greeting { + top: 0; width: 100%; display: table; + position: -webkit-sticky; + position: sticky; + background-color: #FFFFFF; + border-bottom: 1px solid #CCCCCC; } .nav-container .wrapper .greeting > i { font-size: 26px; @@ -4650,7 +4764,8 @@ button[disabled] { vertical-align: top; } .nav-container .wrapper ul { - color: black; + font-weight: 600; + color: #111111; border-top: 1px solid #CCCCCC; } .nav-container .wrapper ul li { @@ -4660,7 +4775,8 @@ button[disabled] { .nav-container .wrapper ul li:hover { background-color: #ECECEC; } - .nav-container .wrapper ul li .category-logo { + .nav-container .wrapper ul li .category-logo, + .nav-container .wrapper ul li .language-logo-wrapper { width: 18px; height: 18px; margin-right: 5px; @@ -4676,43 +4792,137 @@ button[disabled] { .nav-container .wrapper ul li .nested-category li:last-child { padding-bottom: 0; } + .nav-container .wrapper .vc-customer-options li, + .nav-container .wrapper .category-wrapper li { + font-size: 14px; + } + .nav-container .wrapper .vc-customer-options li i.icon, + .nav-container .wrapper .category-wrapper li i.icon { + speak: none; + line-height: 1; + font-style: normal; + font-weight: normal; + text-transform: none; + font-variant: normal; + -webkit-font-smoothing: antialiased; + font-family: 'Webkul Rango' !important; + font-size: 18px; + padding-right: 5px; + } + .nav-container .wrapper .vc-customer-options li i.icon.profile::before, + .nav-container .wrapper .category-wrapper li i.icon.profile::before { + content: "\E995"; + } + .nav-container .wrapper .vc-customer-options li i.icon.address::before, + .nav-container .wrapper .category-wrapper li i.icon.address::before { + content: "\E949"; + } + .nav-container .wrapper .vc-customer-options li i.icon.reviews::before, + .nav-container .wrapper .category-wrapper li i.icon.reviews::before { + content: "\E97D"; + } + .nav-container .wrapper .vc-customer-options li i.icon.wishlist::before, + .nav-container .wrapper .category-wrapper li i.icon.wishlist::before { + content: "\E93E"; + } + .nav-container .wrapper .vc-customer-options li i.icon.orders::before, + .nav-container .wrapper .category-wrapper li i.icon.orders::before { + content: "\E931"; + } + .nav-container .wrapper .vc-customer-options li i.icon.downloadables::before, + .nav-container .wrapper .category-wrapper li i.icon.downloadables::before { + content: "\E926"; + } .nav-container .drawer-section { padding: 15px; } - .auth-content > .container { - margin: 0; + .nav-container .header.drawer-section { width: 100%; - } - .category-page-wrapper .layered-filter-wrapper { - display: none; - } - .category-page-wrapper .category-container { - margin: 0; - padding-left: 0px !important; - padding-right: 0px !important; - } - .category-page-wrapper .category-container > div { - padding: 0 10px; - } - .category-page-wrapper .category-container .filters-container { - padding: 0; - } - .category-page-wrapper .category-container .filters-container .toolbar-wrapper > div.col-4 { - margin: 0; - padding: 0; display: table; - text-align: center; } - .category-page-wrapper .category-container .filters-container .toolbar-wrapper > div.col-4 i { - left: 20px; - position: relative; - } - .category-page-wrapper .category-container .filters-container .toolbar-wrapper > div.col-4 * { + .nav-container .header.drawer-section > * { display: table-cell; vertical-align: middle; } - .category-page-wrapper .category-container .filters-container .toolbar-wrapper > div.col-4:nth-of-type(2) i { - left: 15px; + .nav-container .header.drawer-section i { + width: 25px; + padding-right: 10px; + } + .nav-container .layered-filter-wrapper { + width: 100%; + display: block; + padding-top: 0; + margin-bottom: 0; + } + .category-container .grid-card, + .search-container .grid-card { + width: 45%; + } + .category-container .grid-card:nth-child(odd), + .search-container .grid-card:nth-child(odd) { + float: left; + } + .category-container .grid-card:nth-child(even), + .search-container .grid-card:nth-child(even) { + float: right; + } + .cart-details.offset-1 { + margin-left: 0; + padding-left: 0; + padding-right: 0; + } + .cart-details .order-summary-container.offset-1 { + margin-left: 0; + padding-left: 0; + padding-right: 0; + } + .cart-details h1, + .cart-details .cart-details-header { + padding: 0; + } + .cart-details h1 { + margin-bottom: 20px; + } + .cart-details .cart-header { + display: none; + } + .cart-details .cart-item-list > div { + margin: 0; + padding: 0; + } + .cart-details .product-price span:nth-child(1), + .cart-details .product-price .special-price { + font-size: 18px; + } + .cart-details .actions { + margin-top: 7px !important; + } + .checkout-process { + margin-left: 0 !important; + padding-left: 0 !important; + padding-right: 0 !important; + } + .checkout-process h1, + .checkout-process > div { + padding: 0; + } + .checkout-process .accordian-header h3 { + margin-bottom: 0 !important; + } + .checkout-process .billing-address { + margin-bottom: 20px; + } + .address-holder > div { + padding-right: 0; + padding-bottom: 15px; + } + .wishlist-container { + width: 100% !important; + margin: 0px !important; + padding: 0px !important; + } + .wishlist-container .product-card-new { + margin-left: 0; } } diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js index 0e5095a95..8412bbff3 100644 --- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js +++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js @@ -1117,12 +1117,21 @@ __WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('child-sidebar', __webpack __WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('card-list-content', __webpack_require__(63)); __WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('card-list-header', __webpack_require__(66)); __WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('magnify-image', __webpack_require__(69)); +__WEBPACK_IMPORTED_MODULE_0_vue___default.a.component('responsive-sidebar', __webpack_require__(76)); window.eventBus = new __WEBPACK_IMPORTED_MODULE_0_vue___default.a(); $(document).ready(function () { // define a mixin object __WEBPACK_IMPORTED_MODULE_0_vue___default.a.mixin({ + data: function data() { + return { + 'navContainer': false, + 'responsiveSidebarTemplate': '', + 'responsiveSidebarKey': Math.random() + }; + }, + methods: { redirect: function redirect(route) { route ? window.location.href = route : ''; @@ -1239,6 +1248,8 @@ $(document).ready(function () { }, mounted: function mounted() { + document.body.style.display = "block"; + var sliderContainer = $('.slides-container'); if (sliderContainer && sliderContainer.length) { sliderContainer = sliderContainer[0]; @@ -36908,5 +36919,122 @@ if (false) { // removed by extract-text-webpack-plugin +/***/ }), +/* 74 */, +/* 75 */, +/* 76 */ +/***/ (function(module, exports, __webpack_require__) { + +var disposed = false +var normalizeComponent = __webpack_require__(1) +/* script */ +var __vue_script__ = __webpack_require__(78) +/* template */ +var __vue_template__ = __webpack_require__(77) +/* 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/responsive-sidebar.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-3cf1203e", Component.options) + } else { + hotAPI.reload("data-v-3cf1203e", Component.options) + } + module.hot.dispose(function (data) { + disposed = true + }) +})()} + +module.exports = Component.exports + + +/***/ }), +/* 77 */ +/***/ (function(module, exports, __webpack_require__) { + +var render = function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _vm.isMobile() && _vm.navContainer + ? _c( + "div", + { key: _vm.key, staticClass: "nav-container scrollable" }, + [_vm._t("sidebar-body")], + 2 + ) + : _vm._e() +} +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-3cf1203e", module.exports) + } +} + +/***/ }), +/* 78 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); +// +// +// +// +// +// +// +// +// + +/* harmony default export */ __webpack_exports__["default"] = ({ + data: function data() { + return { + templateRender: null + }; + }, + + staticRenderFns: [], + + created: function created() { + debugger; + }, + + computed: { + 'key': function key() { + debugger; + return this.$root.responsiveSidebarKey; + } + }, + + render: function render(h) { + debugger; + } +}); + /***/ }) /******/ ]); \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/responsive-sidebar.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/responsive-sidebar.vue new file mode 100644 index 000000000..6e1893f33 --- /dev/null +++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/responsive-sidebar.vue @@ -0,0 +1,35 @@ + + + \ 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 50a8d8a67..ac96c848c 100755 --- a/packages/Webkul/Velocity/src/Resources/assets/js/app.js +++ b/packages/Webkul/Velocity/src/Resources/assets/js/app.js @@ -28,12 +28,21 @@ Vue.component('child-sidebar', require('./UI/components/child-sidebar')); Vue.component('card-list-content', require('./UI/components/card-list')); Vue.component('card-list-header', require('./UI/components/card-header')); Vue.component('magnify-image', require('./UI/components/image-magnifier')); +Vue.component('responsive-sidebar', require('./UI/components/responsive-sidebar')); window.eventBus = new Vue(); $(document).ready(function () { // define a mixin object Vue.mixin({ + data: function () { + return { + 'navContainer': false, + 'responsiveSidebarTemplate': '', + 'responsiveSidebarKey': Math.random(), + } + }, + methods: { redirect: function (route) { route ? window.location.href = route : ''; @@ -125,7 +134,7 @@ $(document).ready(function () { } else { return false } - } + }, } }); @@ -150,6 +159,8 @@ $(document).ready(function () { }, mounted: function () { + document.body.style.display = "block"; + let sliderContainer = $('.slides-container'); if (sliderContainer && sliderContainer.length) { sliderContainer = sliderContainer[0]; diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/_mixins.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/_mixins.scss index 0bf8f5291..2ffa96c67 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/_mixins.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/_mixins.scss @@ -11,3 +11,20 @@ -ms-border-radius: $radius; border-radius: $radius; } + +@mixin rango-default { + speak: none; + line-height: 1; + font-style: normal; + font-weight: normal; + text-transform: none; + font-variant: normal; + -webkit-font-smoothing: antialiased; + font-family: 'Webkul Rango' !important; +} + +@mixin remove-padding-margin { + width: 100% !important; + margin: 0px !important; + padding: 0px !important; +} 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 0c4414d3f..6ae3a4234 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss @@ -271,7 +271,7 @@ .cart-wish-wrap { .wishlist-icon { - height: 32px; + height: 38px; display: table; text-align: right; @@ -678,6 +678,14 @@ margin-top: 20px; margin-left: 15px; } + + .coupon-container { + margin-top: 20px; + + .control-error { + padding: 10px 0; + } + } } .account-content { @@ -1077,7 +1085,8 @@ } .custom-form { - .row { + .form-field { + padding: 0; margin-bottom: 30px; } @@ -1841,3 +1850,35 @@ .category-page-wrapper { @extend .remove-padding-margin; } + +.bottom-toolbar { + .pagination { + .page-item { + padding: 0 10px; + } + + a { + color: unset !important; + text-decoration: none !important; + + i { + top: 2px; + font-size: 18px; + position: relative; + } + } + + .angle-left-icon, + .angle-right-icon { + @include rango-default; + + background: unset; + } + .angle-right-icon::before { + content: "\E908"; + } + .angle-left-icon::before { + content: "\E907"; + } + } +} 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 d769014a4..0930e9aef 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss @@ -10,13 +10,6 @@ background-color: #4d7ea8; .newsletter-wrapper { - display: flex; - display: -webkit-box; - display: -ms-flexbox; - -ms-flex-pack: justify; - -webkit-box-pack: justify; - justify-content: space-between; - input.subscribe-field { width: 300px; border: none; 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 fb908f266..285e23bf4 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss @@ -1,6 +1,7 @@ /* @author Shubham Mehrotra */ body { + display: none; overflow-x: hidden; scroll-behavior: smooth; 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 08aff583c..4bdd70257 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss @@ -105,6 +105,19 @@ display: table-cell; vertical-align: middle; } + + .badge-wrapper { + top: -2px; + left: -7px; + position: relative; + + .badge { + z-index: 10; + border-radius: 50%; + position: absolute; + background: $theme-color; + } + } } } } @@ -115,6 +128,8 @@ } .product-card-new { + max-width: 16rem; + .cart-wish-wrap { .wishlist-icon { text-align: left; @@ -176,6 +191,9 @@ padding: 10px 20px; .newsletter-wrapper { + margin: 0; + padding: 0; + input.subscribe-field { width: 200px; } @@ -324,19 +342,90 @@ } } + .auth-content { + &.form-container { + > .container { + margin: 0; + width: 100%; + + > div:first-child { + padding: 0; + + .body { + padding: 20px; + } + } + } + } + } + + .category-page-wrapper { + .layered-filter-wrapper { + display: none; + } + + .category-container { + margin: 0; + margin-top: 20px; + padding-left: 0px !important; + padding-right: 0px !important; + + > div { + padding: 0 10px; + } + + .filters-container { + left: 0px; + top: -15px; + padding: 0; + width: 100%; + position: absolute; + padding-bottom: 10px; + box-shadow: 0 2px 4px 0 rgba(0,0,0,0.21); + + .toolbar-wrapper { + > div.col-4 { + margin: 0; + padding: 0; + display: table; + text-align: center; + + * { + display: table-cell; + vertical-align: middle; + } + + a { + text-align: center; + display: inline-block; + } + + span { + left: 5px; + position: relative; + } + } + } + } + } + } + .nav-container { top: 0px; left: 0px; - z-index: 10; + width: 100%; + z-index: 9999; height: 100vh; position: fixed; font-size: 16px; overflow-y: scroll; + padding-right: 15px; box-shadow: 0 2px 8px 0; - width: 300px !important; background-color: $white-color; .wrapper { + position: relative; + .category-title { width: 100%; display: table; @@ -363,8 +452,12 @@ } .greeting { + top: 0; width: 100%; display: table; + position: sticky; + background-color: $white-color; + border-bottom: 1px solid $border-common; > i { font-size: 26px; @@ -380,7 +473,8 @@ } ul { - color: black; + font-weight: 600; + color: $black-color; border-top: 1px solid $border-common; li { @@ -391,7 +485,8 @@ background-color: $border-light; } - .category-logo { + .category-logo, + .language-logo-wrapper { width: 18px; height: 18px; margin-right: 5px; @@ -412,62 +507,172 @@ } } } - } - .drawer-section { - padding: 15px; - } - } + .vc-customer-options, + .category-wrapper { + li { + font-size: 14px; - .auth-content { - > .container { - margin: 0; - width: 100%; - } - } + i { + &.icon { + @include rango-default; - .category-page-wrapper { - .layered-filter-wrapper { - display: none; - } + font-size: 18px; + padding-right: 5px; - .category-container { - margin: 0; - padding-left: 0px !important; - padding-right: 0px !important; + &.profile::before { + content: "\E995"; + } - > div { - padding: 0 10px; - } + &.address::before { + content: "\e949"; + } - .filters-container { - padding: 0; + &.reviews::before { + content: "\e97d"; + } - .toolbar-wrapper { - > div.col-4 { - margin: 0; - padding: 0; - display: table; - text-align: center; + &.wishlist::before { + content: "\e93e"; + } - i { - left: 20px; - position: relative; - } + &.orders::before { + content: "\e931"; + } - * { - display: table-cell; - vertical-align: middle; - } - } - - > div.col-4:nth-of-type(2) { - i { - left: 15px; + &.downloadables::before { + content: "\e926"; + } } } } } } + + .drawer-section { + padding: 15px; + } + + .header { + &.drawer-section { + width: 100%; + display: table; + + > * { + display: table-cell; + vertical-align: middle; + } + + i { + width: 25px; + padding-right: 10px; + } + } + } + + .layered-filter-wrapper { + width: 100%; + display: block; + padding-top: 0; + margin-bottom: 0; + } + } + + .category-container, + .search-container { + .grid-card { + width: 45%; + } + + .grid-card:nth-child(odd) { + float: left; + } + + .grid-card:nth-child(even) { + float: right; + } + } + + .cart-details { + &.offset-1 { + margin-left: 0; + padding-left: 0; + padding-right: 0; + } + + .order-summary-container { + &.offset-1 { + margin-left: 0; + padding-left: 0; + padding-right: 0; + } + } + + h1, + .cart-details-header { + padding: 0; + } + + h1 { + margin-bottom: 20px; + } + + .cart-header { + display: none; + } + + .cart-item-list { + > div { + margin: 0; + padding: 0; + } + } + + .product-price { + span:nth-child(1), + .special-price { + font-size: 18px; + } + } + + .actions { + margin-top: 7px !important; + } + } + + .checkout-process { + margin-left: 0 !important; + padding-left: 0 !important; + padding-right: 0 !important; + + h1, + > div { + padding: 0; + } + + .accordian-header { + h3 { + margin-bottom: 0 !important; + } + } + + .billing-address { + margin-bottom: 20px; + } + } + + .address-holder { + > div { + padding-right: 0; + padding-bottom: 15px; + } + } + + .wishlist-container { + @include remove-padding-margin; + + .product-card-new { + margin-left: 0; + } } } \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/lang/en/app.php b/packages/Webkul/Velocity/src/Resources/lang/en/app.php index 67839ab97..61e6c8202 100644 --- a/packages/Webkul/Velocity/src/Resources/lang/en/app.php +++ b/packages/Webkul/Velocity/src/Resources/lang/en/app.php @@ -243,6 +243,12 @@ return [ 'new-password' => 'New password', 'confirm-new-password' => 'Confirm new password', 'top-brands' => 'Top Brands', + 'filter' => 'Filter', + 'view' => 'View', + 'addresses' => 'Addresses', + 'reviews' => 'Reviews', + 'orders' => 'Orders', + 'downloadables' => 'Downloadable Products', ], ], @@ -250,7 +256,7 @@ return [ 'header' => [ 'greeting' => 'Welcome, :customer !', ] - ] + ], ] ?> 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 1ee6b568d..0fc7065d2 100644 --- a/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php @@ -148,8 +148,8 @@
-
-
+
+
perm_identity @guest('customer') @@ -167,15 +167,41 @@
-
@@ -252,11 +355,74 @@
+ +
+
+ +

Languages

+ cancel +
+ + +
+ +
+
+ +

Currencies

+ cancel +
+ + +
+
@@ -269,7 +435,19 @@ search - + @php + $cart = cart()->getCart(); + + $cartItemsCount = trans('shop::app.minicart.zero'); + if ($cart) { + $cartItemsCount = $cart->items->count(); + } + @endphp + + +
+ {{ $cartItemsCount }} +
shopping_cart
@@ -310,6 +488,16 @@ + + \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/index.blade.php index 98f05c03c..b6ba941a1 100644 --- a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/index.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/index.blade.php @@ -8,173 +8,207 @@ @stop @section('content-wrapper') -
-
-

{{ __('shop::app.checkout.cart.title') }}

- -
- {{-- TODO:- USE table insted of column --}} - @if ($cart) -
- - {{ __('velocity::app.checkout.items') }} - - - - {{ __('velocity::app.checkout.qty') }} - - - - {{ __('velocity::app.checkout.subtotal') }} - -
- @endif - - @if ($cart) -
-
- -
- @csrf - - @foreach ($cart->items as $key => $item) - - @php - $productBaseImage = $item->product->getTypeInstance()->getBaseImage($item); - $product = $item->product; - - $productPrice = $product->getTypeInstance()->getProductPrices(); - - @endphp - -
- - - {{ $product->name }} - - -
-
- - - {{ $product->name }} - -
- -
- @include ('shop::products.price', ['product' => $product]) -
- -
- - - {{ __('shop::app.checkout.cart.remove') }} - -
-
- -
- - -
- -
- - {{ core()->currency( $item->base_total) }} - -
-
- - @endforeach -
- - {!! view_render_event('bagisto.shop.checkout.cart.controls.after', ['cart' => $cart]) !!} - - {{ __('shop::app.checkout.cart.continue-shopping') }} - - - - {!! view_render_event('bagisto.shop.checkout.cart.controls.after', ['cart' => $cart]) !!} -
-
- - @include ('shop::products.view.cross-sells') - @endif -
- - {!! view_render_event('bagisto.shop.checkout.cart.summary.after', ['cart' => $cart]) !!} - - @if ($cart) -
- @include('shop::checkout.total.summary', ['cart' => $cart]) - - -
- @else -
- {{ __('shop::app.checkout.cart.empty') }} -
- - - - - - @endif - - {!! view_render_event('bagisto.shop.checkout.cart.summary.after', ['cart' => $cart]) !!} - -
-
+ @endsection @push('scripts') @include('shop::checkout.cart.coupon') - + + @endpush \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php index a3f307604..ba17be050 100644 --- a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php @@ -13,11 +13,10 @@ - + @stack('scripts') diff --git a/packages/Webkul/Velocity/src/Resources/views/products/add-to-cart.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/add-to-cart.blade.php index 0ce9e2096..030821fa2 100644 --- a/packages/Webkul/Velocity/src/Resources/views/products/add-to-cart.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/products/add-to-cart.blade.php @@ -1,6 +1,6 @@ {!! view_render_event('bagisto.shop.products.add_to_cart.before', ['product' => $product]) !!} -
+
@if (isset($form) && !$form)