From 69ada20a2b7f306015b6756c5e5d18e360e82d72 Mon Sep 17 00:00:00 2001 From: jitendra Date: Thu, 27 Sep 2018 10:55:06 +0530 Subject: [PATCH] Unnecessary css removed --- .../Shop/src/Resources/assets/js/app.js | 2 +- .../src/Resources/assets/sass/_variables.scss | 26 +- .../Shop/src/Resources/assets/sass/app.scss | 1512 +++++------------ .../Shop/src/Resources/assets/sass/icons.scss | 12 + .../Webkul/Shop/src/Resources/lang/en/app.php | 5 +- .../views/checkout/cart/index.blade.php | 86 +- .../views/checkout/onepage/review.blade.php | 231 +-- .../views/checkout/total/summary.blade.php | 25 +- .../checkout/common/common.blade.php | 8 - .../checkout/common/nav-left.blade.php | 53 - .../checkout/common/nav-right.blade.php | 3 - .../customers/checkout/complete.blade.php | 265 --- .../views/customers/checkout/guest.blade.php | 73 - .../views/customers/checkout/index.blade.php | 66 - .../checkout/payment-method.blade.php | 57 - .../customers/checkout/ship-method.blade.php | 52 - .../views/customers/checkout/signin.blade.php | 40 - .../Resources/views/layouts/master.blade.php | 2 + public/themes/default/assets/css/shop.css | 1180 +++---------- public/themes/default/assets/js/shop.js | 2 +- 20 files changed, 815 insertions(+), 2885 deletions(-) delete mode 100644 packages/Webkul/Shop/src/Resources/views/customers/checkout/common/common.blade.php delete mode 100644 packages/Webkul/Shop/src/Resources/views/customers/checkout/common/nav-left.blade.php delete mode 100644 packages/Webkul/Shop/src/Resources/views/customers/checkout/common/nav-right.blade.php delete mode 100644 packages/Webkul/Shop/src/Resources/views/customers/checkout/complete.blade.php delete mode 100644 packages/Webkul/Shop/src/Resources/views/customers/checkout/guest.blade.php delete mode 100644 packages/Webkul/Shop/src/Resources/views/customers/checkout/index.blade.php delete mode 100644 packages/Webkul/Shop/src/Resources/views/customers/checkout/payment-method.blade.php delete mode 100644 packages/Webkul/Shop/src/Resources/views/customers/checkout/ship-method.blade.php delete mode 100644 packages/Webkul/Shop/src/Resources/views/customers/checkout/signin.blade.php diff --git a/packages/Webkul/Shop/src/Resources/assets/js/app.js b/packages/Webkul/Shop/src/Resources/assets/js/app.js index 87860f794..d4abea11f 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/app.js +++ b/packages/Webkul/Shop/src/Resources/assets/js/app.js @@ -63,10 +63,10 @@ $(document).ready(function () { const flashes = this.$refs.flashes; flashMessages.forEach(function (flash) { - console.log(flash); flashes.addFlash(flash); }, this); }, + responsiveHeader: function () { } } }); diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss index dde936d7c..67c473993 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss @@ -1,32 +1,12 @@ //shop variables $font-color: #242424; +$border-color: #E8E8E8; $font-size-base: 16px; -$font-name: "Montserrat", sans-serif; -$background-color: #f2f2f2; -$footer-back: #f2f2f2; -$list-heading-color: rgba(165, 165, 165, 1); -$list-color: #242424; -$subscribe-btn-color: black; -$logo-color: #0031f0; $border-color: #c7c7c7; -$offer-color: #ff6472; +$brand-color: #0031f0; //shop variables ends here //customer variables -$sign-up-text-color: #5e5e5e; -$login-text: #3a3a3a; -$background-color: #ffffff; -$color-black : black; -$forgot-password-color: #0031f0; $profile-content-color: #5e5e5e; $horizontal-rule-color: #E8E8E8; -//customer variables ends here - -//product -$real-price:#A5A5A5; -$product-font-color: #242424; -$product-special-price-color: #FF6472; -$product-price-color: #FF6472; -$dark-blue-shade: #0031F0; -$bar-color: #D8D8D8; -$gray-shade: #5E5E5E; \ No newline at end of file +//customer variables ends here \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index b18ddcd09..07fbc6dc6 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -140,7 +140,7 @@ body { padding-right: 5px; .cart-count { - color: #0031f0; + color: $brand-color; padding-right: 3px; } } @@ -184,7 +184,6 @@ body { margin-right: auto; border-top: 1px solid lightgrey; border-bottom: 1px solid lightgrey; - font-size: 16px; display: block; ul.nav { @@ -299,8 +298,8 @@ body { } +//=======>Need to be removed // header page responsive css start here - @media all and (max-width: 480px) { .header { @@ -353,8 +352,8 @@ body { display: none; .search-content { - border-top: 1px solid #e8e8e8; - border-bottom: 1px solid #e8e8e8; + border-top: 1px solid $border-color; + border-bottom: 1px solid $border-color; height: 48px; .icon.search-icon { @@ -363,8 +362,6 @@ body { } span { - font-size: 16px; - color: #242424; margin-bottom: -7px; margin-left: 5px; } @@ -379,11 +376,9 @@ body { margin-top: 14px; height: 32px; margin-bottom: 14px; - border-bottom: 1px solid #e8e8e8; + border-bottom: 1px solid $border-color; span { - font-size: 16px; - color: #242424; margin-left: 48px; } } @@ -404,7 +399,7 @@ body { .nav > li { float: none; - border-bottom: 1px solid #e8e8e8; + border-bottom: 1px solid $border-color; a { margin-left: 10px; @@ -418,14 +413,13 @@ body { } .nav > li:first-child { - border-top: 1px solid #e8e8e8; + border-top: 1px solid $border-color; } .nav > li:last-child { float:none; span { - font-size: 16px; color: #FF6472; letter-spacing: -0.38px; } @@ -540,7 +534,7 @@ body { .nav > li { float: none; - border-bottom: 1px solid #e8e8e8; + border-bottom: 1px solid $border-color; a { margin-left: 10px; @@ -554,14 +548,13 @@ body { } .nav > li:first-child { - border-top: 1px solid #e8e8e8; + border-top: 1px solid $border-color; } .nav > li:last-child { float:none; span { - font-size: 16px; color: #FF6472; letter-spacing: -0.38px; } @@ -608,9 +601,9 @@ body { } } - - // header page responsive ends here +//<=======Need to be removed + section.slider-block { display: block; @@ -651,6 +644,7 @@ section.slider-block { width:100%; } } + div.slider-control { display: block; position: absolute; @@ -660,7 +654,7 @@ section.slider-block { .dark-left-icon { - background-color: $background-color; + background-color: #f2f2f2; height: 48px; width: 48px; max-height: 100%; @@ -668,7 +662,7 @@ section.slider-block { } .light-right-icon { - background-color: $color-black; + background-color: #000; height: 48px; width: 48px; max-height: 100%; @@ -685,27 +679,25 @@ section.slider-block { min-height: 1px; .filter-title { - border-bottom: 1px solid #E8E8E8; - font-size: 16px; + border-bottom: 1px solid $border-color; color: $font-color; padding: 10px 0; } .filter-attributes { .filter-attributes-item { - border-bottom: 1px solid #E8E8E8; + border-bottom: 1px solid $border-color; padding-bottom: 10px; .filter-attributes-title { padding: 10px 40px 0 10px; - font-size: 16px; color: #5E5E5E; cursor: pointer; position: relative; .remove-filter-link { font-weight: 400; - color: #0031F0; + color: $brand-color; margin-right: 10px; } @@ -730,7 +722,6 @@ section.slider-block { li.item { padding: 8px 0; - font-size: 16px; color: #5E5E5E; .checkbox { @@ -767,7 +758,6 @@ section.slider-block { } } - .main-container-wrapper { max-width: 80%; width: auto; @@ -812,7 +802,6 @@ section.slider-block { } .product-name { - font-size: 16px; margin-bottom: 14px; width: 100%; color: $font-color; @@ -823,7 +812,6 @@ section.slider-block { } .product-description { - font-size: 16px; margin-bottom: 14px; display: none; } @@ -907,7 +895,6 @@ section.slider-block { float: right; label { - font-size: 16px; margin-right: 5px; } @@ -915,7 +902,6 @@ section.slider-block { background: #FFFFFF; border: 1px solid #C7C7C7; border-radius: 3px; - font-size: 16px; color: $font-color; padding: 10px; } @@ -1028,8 +1014,9 @@ section.slider-block { } } -// responsive category css start here +//=======>Need to be removed +// responsive category css start here @media all and (max-width: 480px) { .main-container-wrapper { @@ -1078,7 +1065,7 @@ section.slider-block { } .top-toolbar { - border-bottom: 1px solid #E8E8E8; + border-bottom: 1px solid $border-color; margin-bottom: 10px; .page-info { @@ -1129,7 +1116,6 @@ section.slider-block { background: #FFFFFF; border: 1px solid #C7C7C7; border-radius: 3px; - font-size: 16px; color: $font-color; padding: 10px; } @@ -1189,7 +1175,7 @@ section.slider-block { } .top-toolbar { - border-bottom: 1px solid #E8E8E8; + border-bottom: 1px solid $border-color; margin-bottom: 10px; .page-info { @@ -1240,7 +1226,6 @@ section.slider-block { background: #FFFFFF; border: 1px solid #C7C7C7; border-radius: 3px; - font-size: 16px; color: $font-color; padding: 10px; } @@ -1251,9 +1236,10 @@ section.slider-block { } } } +//<=======Need to be removed + .product-price { - font-size: 16px; margin-bottom: 14px; width: 100%; font-weight: 600; @@ -1264,20 +1250,18 @@ section.slider-block { } .regular-price { - font-size: 16px; color: #A5A5A5; text-decoration: line-through; margin-right: 10px; } .special-price { - font-size: 16px; color: #FF6472; } } .footer { - background-color: $footer-back; + background-color: #f2f2f2; padding-left: 10%; padding-right: 10%; @@ -1294,10 +1278,9 @@ section.slider-block { .list-container { .list-heading { - font-size: 16px; letter-spacing: -0.26px; text-transform: uppercase; - color: $list-heading-color; + color: rgba(165, 165, 165, 1); } .list-group { @@ -1305,7 +1288,6 @@ section.slider-block { li { margin-bottom: 12px; - color: $list-color; list-style-type: none; text-transform: uppercase; @@ -1343,7 +1325,7 @@ section.slider-block { } .btn-primary { - background-color: $subscribe-btn-color; + background-color: #000; margin-top: 8px; border-radius: 0px; text-align: center; @@ -1356,7 +1338,6 @@ section.slider-block { } //customers page css goes here - .content { padding-top: 15%; padding-bottom: 15%; @@ -1367,7 +1348,7 @@ section.slider-block { margin-right: auto; text-align: center; font-size: 18px; - color: $sign-up-text-color; + color: #5e5e5e; letter-spacing: -0.29px; text-align: center; } @@ -1376,7 +1357,7 @@ section.slider-block { margin-left: auto; margin-right: auto; display: flex; - background: $background-color; + background: #f2f2f2; border: 1px solid $border-color; flex-direction: column; max-width: 530px; @@ -1388,7 +1369,7 @@ section.slider-block { .login-text { font-size: 24px; font-weight: bold; - color: $login-text; + color: #3a3a3a; letter-spacing: -0.23px; margin-top: 5%; margin-bottom: 3%; @@ -1404,7 +1385,7 @@ section.slider-block { .forgot-password-link { font-size: 17px; - color: $forgot-password-color; + color: $brand-color; letter-spacing: -0.11px; margin-bottom: 5%; } @@ -1437,16 +1418,14 @@ section.slider-block { flex-direction: column; align-content: center; justify-content: flex-start; - border: 1px solid #e8e8e8; - background: $background-color; + border: 1px solid $border-color; + background: #f2f2f2; width: 25%; height: 100%; text-transform: capitalize; - font-size: 16px; color: #5e5e5e; li { - font-size: 16px; width: 95%; height: 50px; margin-left: 5%; @@ -1467,7 +1446,7 @@ section.slider-block { } li.active { - color: $forgot-password-color; + color: $brand-color; } } @@ -1487,7 +1466,7 @@ section.slider-block { .profile-edit { font-size: 17px; margin-top: 1%; - color: #0031f0; + color: $brand-color; letter-spacing: -0.11px; float: right; } @@ -1497,13 +1476,12 @@ section.slider-block { width: 100%; height: 1px; vertical-align: middle; - background: #e8e8e8; + background: $border-color; } } } .profile-content { - font-size: 16px; color: $profile-content-color; margin-top: 1.4%; @@ -1536,7 +1514,7 @@ section.slider-block { .edit-form { display: flex; - background: $background-color; + background: #f2f2f2; border: 1px solid $border-color; flex-direction: column; min-height: 345px; @@ -1550,8 +1528,7 @@ section.slider-block { // product pages css starts here section.product-detail { - font-size: 16px; - color: $product-font-color; + color: $font-color; div.category-breadcrumbs { display: inline; @@ -1713,7 +1690,7 @@ section.product-detail { .product-heading { font-size: 24px; - color: $product-font-color; + color: $font-color; margin-bottom: 15px; } @@ -1748,7 +1725,6 @@ section.product-detail { } .accordian .accordian-header { - font-size: 16px; padding-left: 0; font-weight: 600; } @@ -1762,104 +1738,15 @@ section.product-detail { width: 100%; border-bottom: solid 1px rgba(162, 162, 162, 0.2); } - - .full-description { - font-size: 16px; - } } - - // .rating-reviews { - // margin-top: 0px; - // width: 50%; - // margin-left: 20px; - - // .title-inline { - // display: inline-flex; - // align-items: center; - // justify-content: space-between; - // margin-bottom: 20px; - // width: 100%; - - // button { - // float: right; - // border-radius: 0px !important; - // } - // } - - // .overall { - // display: flex; - // flex-direction: row; - // align-items: center; - // justify-content: space-between; - // height: 150px; - - // .left-side { - // margin-bottom: 20px; - - // .number{ - // font-size: 34px; - // } - // } - - // .right-side { - // display: block; - - // .rater { - // display: inline-flex; - // align-items: center; - - // .star { - // width: 50px; - // height: 20px; - // padding: 1px; - // margin-right: 8px; - // } - - // .line-bar { - // height: 4px; - // width: 158px; - // margin-right: 12px; - // background: $bar-color; - - // .line-value { - // background-color: $dark-blue-shade; - // } - // } - // } - // } - // } - - // .reviews { - // margin-top: 34px; - // margin-bottom: 90px; - - // .review { - // margin-bottom: 25px; - - // .title { - // margin-bottom: 5px; - // } - - // .stars { - // margin-bottom: 15px; - // } - // .message { - // margin-bottom: 10px; - // } - // } - // .view-all { - // margin-top:15px; - // color: $logo-color; - // margin-bottom:15px; - // } - // } - // } } } } +// product pages css ends here -// products responsive css start here +//=======>Need to be removed +// products responsive css starts here @media all and (max-width: 480px) { section.product-detail { @@ -1912,7 +1799,7 @@ section.product-detail { .details { width: 100%; margin-top: 20px; - border-bottom: 1px solid #e8e8e8e8; + border-bottom: 1px solid $border-color; .attributes { border-bottom: none; @@ -1976,7 +1863,7 @@ section.product-detail { .details { width: 100%; margin-top: 20px; - border-bottom: 1px solid #e8e8e8e8; + border-bottom: 1px solid $border-color; .attributes { border-bottom: none; @@ -1987,8 +1874,8 @@ section.product-detail { } } - -// products responsive css end here +// products responsive css ends here +//<=======Need to be removed .rating-reviews { @@ -2048,7 +1935,7 @@ section.product-detail { .view-all { margin-top:15px; - color: $logo-color; + color: $brand-color; margin-bottom:15px; } } @@ -2056,8 +1943,7 @@ section.product-detail { /* cart pages and elements css begins here */ section.cart { - color: $product-font-color; - font-size: 16px; + color: $font-color; margin-bottom: 80px; .title { @@ -2069,214 +1955,216 @@ section.cart { padding: 1px; display: flex; flex-direction: row; + } +} - .left-side { - width: 68.6%; - margin-right: 2.4%; +.cart { + .left-side { + width: 68.6%; + margin-right: 2.4%; + } - .item { - padding: 1.1%; - margin-bottom: 20px; - display: flex; - flex-direction: row; + .right-side { + width: 29%; + display: block; - .item-image { - height: 160px; - width: 160px; - } + .price-section { + width: 100%; + padding: 10px 10px 18px 18px; + margin-bottom: 20px; + + .title { + font-weight: bold; + padding-bottom: 8px; + margin-bottom: 10px; + } + + .all-item-details { + margin-bottom: 17px; .item-details { - display: flex; - flex-direction: column; + margin-bottom: 10px; - .item-title { - font-size: 18px; - margin-bottom: 10px; + .name { } .price { - margin-bottom: 10px; - - .main-price { - font-size: 18px; - margin-right: 4px; - } - - .real-price { - margin-right: 4px; - text-decoration-line: line-through; - } - - .discount { - color: $product-price-color; - } - } - - .summary { - margin-bottom: 17px; - } - - .misc { - display: inline-flex; - align-items: center; - justify-content: flex-start; - - div.qty-text { - color: $gray-shade; - margin-right: 10px; - } - - div.box { - height: 38px; - width: 60px; - text-align: center; - line-height: 38px; - border: 1px solid $border-color; - border-radius: 3px; - margin-right: 30px; - } - - .remove { - color: $dark-blue-shade; - margin-right: 30px; - } - - .towishlist { - color : $dark-blue-shade; - } - + float: right; } } } + .horizontal-rule { + width: 100%; + height: 1px; + vertical-align: middle; + background: $border-color; + } - .misc-controls { - float: right; + .total-details { + margin-top: 10px; - span { - margin-right: 15px; - } - - button { - border-radius: 0px; + .amount { + float: right; } } } - .right-side { - width: 29%; - display: block; + .coupon-section { + padding: 10px 10px 18px 18px; - .price-section { + .title { + font-weight: bold; + margin-bottom: 10px; + } + + .control-group { + margin-bottom: 12px !important; + + input.coupon-input::-moz-placeholder { + font-family: "montserrat", sans-serif; + color: $font-color; + } + + input.coupon-input::-webkit-input-placeholder { + font-family: "montserrat", sans-serif; + color: $font-color; + } + + } + + button { + margin-bottom: 10px; + background-color: #000; + border-radius: 0px; + } + + .coupon-details { + + .coupon { + margin-bottom: 8px; + + .discount { + float: right; + } + } + } + + .horizontal-rule { width: 100%; - padding: 10px 10px 18px 18px; - margin-bottom: 20px; - - .title { - font-size: 16px; - font-weight: bold; - padding-bottom: 8px; - margin-bottom: 10px; - } - - .all-item-details { - margin-bottom: 17px; - - .item-details { - margin-bottom: 10px; - - .name { - } - - .price { - float: right; - } - } - } - .horizontal-rule { - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; - } - - .total-details { - margin-top: 10px; - - .amount { - float: right; - } - } + height: 1px; + vertical-align: middle; + background: $border-color; + margin-bottom: 9px; } - .coupon-section { - padding: 10px 10px 18px 18px; + .after-coupon-amount { - .title { - font-size: 16px; + .name { font-weight: bold; - margin-bottom: 10px; } - .control-group { - margin-bottom: 12px !important; - - input.coupon-input::-moz-placeholder { - font-family: "montserrat", sans-serif; - font-size: 16px; - color: $product-font-color; - } - - input.coupon-input::-webkit-input-placeholder { - font-family: "montserrat", sans-serif; - font-size: 16px; - color: $product-font-color; - } - - } - - button { - margin-bottom: 10px; - background-color: $color-black; - border-radius: 0px; - } - - .coupon-details { - - .coupon { - margin-bottom: 8px; - - .discount { - float: right; - } - } - } - - .horizontal-rule { - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; - margin-bottom: 9px; - } - - .after-coupon-amount { - - .name { - font-weight: bold; - } - - .amount { - float: right; - font-weight: bold; - } - + .amount { + float: right; + font-weight: bold; } } } + + } +} + +.cart-item-list { + margin-top: 21px; + padding: 1px; + + .item { + padding: 1.1%; + margin-bottom: 20px; + display: flex; + flex-direction: row; + + .item-image { + height: 160px; + width: 160px; + } + + .item-details { + display: flex; + flex-direction: column; + + .item-title { + font-size: 18px; + margin-bottom: 10px; + } + + .price { + margin-bottom: 10px; + + .main-price { + font-size: 18px; + margin-right: 4px; + } + + .real-price { + margin-right: 4px; + text-decoration-line: line-through; + } + + .discount { + color: #FF6472; + } + } + + .summary { + margin-bottom: 17px; + } + + .misc { + display: inline-flex; + align-items: center; + justify-content: flex-start; + + div.qty-text { + color: #5E5E5E; + margin-right: 10px; + } + + div.box { + height: 38px; + width: 60px; + text-align: center; + line-height: 38px; + border: 1px solid $border-color; + border-radius: 3px; + margin-right: 30px; + } + + .remove { + color: $brand-color; + margin-right: 30px; + } + + .towishlist { + color : $brand-color; + } + + } + } } + .misc-controls { + float: right; + + span { + margin-right: 15px; + } + + button { + border-radius: 0px; + } + } } .attached-products-wrapper { @@ -2285,7 +2173,7 @@ section.cart { .title { margin-bottom: 40px; font-size: 18px; - color: $product-font-color; + color: $font-color; text-align: center; position: relative; @@ -2310,6 +2198,8 @@ section.cart { } } + +//=======>Need to be removed @media all and (max-width: 480px){ .attached-products-wrapper { @@ -2328,7 +2218,12 @@ section.cart { } } } +//<=======Need to be removed + + + +//=======>Need to be removed @media all and (min-width: 481px) and (max-width: 920px) { .attached-products-wrapper { @@ -2347,10 +2242,13 @@ section.cart { } } } +//<=======Need to be removed + + +//=======>Need to be removed // order page css start here - .order { margin-left: 5.5%; margin-top: 1%; @@ -2359,7 +2257,6 @@ section.cart { .order-section-head { .order-number { font-size: 28px; - color: #242424; text-transform: capitalize; text-align: left; } @@ -2367,7 +2264,7 @@ section.cart { .order-cancel { font-size: 17px; margin-top: 1%; - color: #0031f0; + color: $brand-color; letter-spacing: -0.11px; float: right; } @@ -2387,7 +2284,7 @@ section.cart { width: 100%; height: 1px; vertical-align: middle; - background: #e8e8e8; + background: $border-color; } } @@ -2396,7 +2293,6 @@ section.cart { } .payment-place { - font-size: 16px; color: $profile-content-color; margin-top: 1.4%; @@ -2410,7 +2306,6 @@ section.cart { span { color: #5E5E5E; letter-spacing: -0.12px; - font-size: 16px; } .processing { @@ -2423,7 +2318,6 @@ section.cart { span { color: #5E5E5E; letter-spacing: -0.12px; - font-size: 16px; } } } @@ -2439,7 +2333,6 @@ section.cart { span { color: #5E5E5E; letter-spacing: -0.12px; - font-size: 16px; } } @@ -2448,7 +2341,6 @@ section.cart { span { color: #5E5E5E; letter-spacing: -0.12px; - font-size: 16px; } } } @@ -2458,7 +2350,7 @@ section.cart { width: 100%; height: 1px; vertical-align: middle; - background: #e8e8e8; + background: $border-color; } } @@ -2595,7 +2487,7 @@ section.cart { width: 100%; height: 1px; vertical-align: middle; - background: #e8e8e8; + background: $border-color; } .order-information { @@ -2614,17 +2506,14 @@ section.cart { } p { - font-size: 16px; color: #3A3A3A; } } } - // oder page css end here // responsive order page css start here - @media all and (max-width: 480px) { .order { @@ -2653,8 +2542,6 @@ section.cart { .order-number { text-align: center; - font-size: 16px; - color: #242424; letter-spacing: -0.38px; text-align: center; margin-top: 13px; @@ -2665,14 +2552,14 @@ section.cart { float: right; text-align: right; font-size: 17px; - color: #0031F0; + color: $brand-color; letter-spacing: -0.11px; margin-top: 13px; margin-bottom: 13px; } .horizon-rule { - border: .5px solid #E8E8E8; + border: .5px solid $border-color; width: 150%; margin-left: -10%; margin-right: -10%; @@ -2680,7 +2567,6 @@ section.cart { } .payment-place { - font-size: 16px; color: $profile-content-color; margin-top: 4%; @@ -2738,7 +2624,7 @@ section.cart { width: 100%; height: 1px; vertical-align: middle; - background: #e8e8e8; + background: $border-color; } } @@ -2846,7 +2732,7 @@ section.cart { } .product-config { - border: 1px solid #E8E8E8; + border: 1px solid $border-color; height: 19%; width:100%; margin-top: 10px; @@ -2873,7 +2759,6 @@ section.cart { width:50%; span { - font-size: 16px; color: #5E5E5E; letter-spacing: -0.11px; } @@ -2933,8 +2818,6 @@ section.cart { .order-number { text-align: center; - font-size: 16px; - color: #242424; letter-spacing: -0.38px; text-align: center; margin-top: 13px; @@ -2945,14 +2828,14 @@ section.cart { float: right; text-align: right; font-size: 17px; - color: #0031F0; + color: $brand-color; letter-spacing: -0.11px; margin-top: 13px; margin-bottom: 13px; } .horizon-rule { - border: .5px solid #E8E8E8; + border: .5px solid $border-color; width: 150%; margin-left: -10%; margin-right: -10%; @@ -2960,7 +2843,6 @@ section.cart { } .payment-place { - font-size: 16px; color: $profile-content-color; margin-top: 4%; @@ -3018,7 +2900,7 @@ section.cart { width: 100%; height: 1px; vertical-align: middle; - background: #e8e8e8; + background: $border-color; } } @@ -3126,7 +3008,7 @@ section.cart { } .product-config { - border: 1px solid #E8E8E8; + border: 1px solid $border-color; height: 19%; width:100%; margin-top: 10px; @@ -3153,7 +3035,6 @@ section.cart { width:50%; span { - font-size: 16px; color: #5E5E5E; letter-spacing: -0.11px; } @@ -3186,9 +3067,11 @@ section.cart { } // responsive order css end here +//<=======Need to be removed + // checkout starts here -.checkout-process{ +.checkout-process { display: flex; flex-direction: row; width: 100%; @@ -3205,7 +3088,7 @@ section.cart { justify-content: space-between; width: 100%; padding-bottom: 15px; - border-bottom: 1px solid #E8E8E8;; + border-bottom: 1px solid $border-color; li { height: 48px; @@ -3217,7 +3100,7 @@ section.cart { border: 1px solid black; border-radius: 50%; display: inline-flex; - border: 1px solid #E8E8E8; + border: 1px solid $border-color; background-repeat: no-repeat; background-position: center; @@ -3250,7 +3133,6 @@ section.cart { margin-left: 7px; margin-top: auto; margin-bottom: auto; - font-size: 16px; } &.active { @@ -3280,7 +3162,7 @@ section.cart { } .form-container { - border-bottom: 1px solid #E8E8E8; + border-bottom: 1px solid $border-color; padding-top: 20px; padding-bottom: 20px; } @@ -3300,774 +3182,158 @@ section.cart { margin-left: 28px; } } + + .address { + display: inline-block; + width: 100%; + + .address-card { + width: 50%; + + &.left { + float: left; + } + + &.right { + float: right; + } + + .card-title span { + font-weight: 600; + } + + .card-content { + margin-top: 15px; + color: #121212; + line-height: 25px; + + .horizontal-rule { + margin: 12px 0; + display: block; + width: 25px; + background: #121212; + } + } + } + } + + .cart-item-list { + .item { + border: 1px solid $border-color; + border-radius: 3px; + padding: 20px; + + .row { + .title { + width: 100px; + display: inline-block; + color: #5E5E5E; + font-weight: 500; + margin-bottom: 10px; + } + + .value { + font-size: 18px; + font-weight: 600; + } + } + } + } + + .order-description { + display: inline-block; + width: 100%; + + .shipping { + margin-bottom: 25px; + } + + .decorator { + height: 48px; + width: 48px; + border-radius: 50%; + border: 1px solid $border-color; + vertical-align: middle; + display: inline-block; + text-align: center; + + .icon { + margin-top: 7px; + } + } + + .text { + font-weight: 600; + vertical-align: middle; + display: inline-block; + + .info { + font-weight: 500; + margin-top: 2px; + } + } + } + // complete page end here + + + + + + + + + + + + + + + + + } } .col-right { width: 35%; padding-left: 40px; - - .order-summary { - - .price { - - span { - margin-left: 3px; - font-size: 16px; - color: #242424; - font-weight: bold; - } - } - - .item-detail { - margin-top:12px; - - span { - margin-left: 3px; - - label { - font-size: 16px; - color: #242424; - } - - .right { - float: right; - font-size: 16px; - color: #242424; - } - } - } - - .horizontal-rule { - margin-top: 6%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; - } - - .payble-amount { - margin-top: 12px; - - span { - margin-left: 3px; - font-weight: bold; - - label { - font-size: 16px; - color: #242424; - font-weight: bold; - } - - .right { - - float:right; - font-size: 16px; - color: #242424; - } - } - } - } } -} - -// checkout ends here - -// responsive checkout start here - -@media all and (max-width: 480px) { - .checkout-process{ - width: 100%; - margin-top: 3%; - - .left-side { - width: 100%; - margin-right: 0%; - height: 60px; - - .checkout-menu { - width: 100%; - - ul.checkout-detail { - height: 60px; - width: 100%; - padding: 5px; - - li { - height: 48px; - - .wrapper { - display: flex; - - span { - display: none; - } - } - } - - .line { - margin-top: 23px; - width: 100%; - margin-left: 5px; - margin-right: 5px; - border: 1px solid #E7E7E7; - height: 1px; - } - } - - .horizontal-rule { - display: none; - } - } - } - - .right-side { - display: none; - } - } - - .order-info{ - width: 100%; - margin-right: 0%; - margin-top: 10px; - height:50px; - - .control-group { - - .control{ - width:100%; - } - } - - .different-billing-addr { - margin-top: 5%; - } - - .horizontal-rule { - margin-top: 10%; - } - - .countinue-button { - margin-top: 8%; - } - } -} - -@media all and (min-width: 481px) and (max-width: 920px) { - - .checkout-process{ - width: 100%; - margin-top:3%; - - .left-side { - width: 100%; - margin-right: 0%; - height: 60px; - - .checkout-menu { - width: 100%; - - ul.checkout-detail { - height: 60px; - width: 100%; - padding: 5px; - - li { - height: 48px; - - .wrapper { - display:flex; - - span { - display: none; - } - - } - } - - .line { - margin-top: 23px; - width: 100%; - margin-left: 10px; - margin-right: 10px; - border: 1px solid #E7E7E7; - height: 1px; - } - } - - .horizontal-rule { - display: none; - } - } - } - - .right-side { - display:none; - } - } - - .order-info{ - width: 100%; - margin-right: 0%; - margin-top: 10px; - height:50px; - - .control-group { - - .control{ - width:100%; - } - } - - .different-billing-addr { - margin-top: 3%; - } - - .horizontal-rule { - margin-top: 10%; - } - - .countinue-button { - margin-top: 5%; - } - } -} -// responsive checkout end here - - - -//shipment start here -.ship-method { - width: 67%; - margin-right: 6%; - height: 600px; - margin-top: -190px; - - .ship-info { - - .ship-text{ - font-size: 24px; - color: #242424; - letter-spacing: -0.58px; - font-weight: bold; - } - } - - .ship-price { - margin-top: 31px; - - .price-checkbox { - display:flex; - - span { - margin-left: 8px; - font-size: 16px; - color: #242424; - line-height: 22px; - font-weight: bold; - } - - } - - .price-checkbox-text { - margin-left: 25px; - width:580px; - height:44px; - margin-top: 4px; - - b { - font-size: 16px; - } - - span { - font-size: 16px; - color: #242424; - line-height: 22px; - } - } - - - } - - .horizontal-rule { - margin-top: 7%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; - } - - .countinue-button { - margin-top: 3%; - - button { - background: #0031F0; - font-size: 14px; - color: #FFFFFF; - letter-spacing: -0.26px; - text-align: center; - height: 38px; - width: 137px; - border: none; - } - } -} -//shipment end here - -// payment method start here -.payment-method { - width: 67%; - margin-right: 6%; - height: 600px; - margin-top: -190px; - - .payment-info { - - .payment-text{ - font-size: 24px; - color: #242424; - letter-spacing: -0.58px; - font-weight: bold; - } - } - - .payment-price { - margin-top: 31px; - - .payment-checkbox { - display:flex; - - span { - margin-left: 8px; - font-size: 16px; - color: #242424; - line-height: 22px; - font-weight: bold; - } - - } - - .payment-checkbox-text { - margin-left: 25px; - width:580px; - height:44px; - margin-top: 4px; - - b { - font-size: 16px; - } - - span { - font-size: 16px; - color: #242424; - line-height: 22px; - } - } - - - } - - .horizontal-rule { - margin-top: 7%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; - } - - .countinue-button { - margin-top: 3%; - - button { - background: #0031F0; - font-size: 14px; .horizontal-rule { - margin-top: 7%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; - } - color: #FFFFFF; - letter-spacing: -0.26px; .horizontal-rule { - margin-top: 7%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; - } - text-align: center; - height: 38px; - width: 137px; - border: none; - } - } -} -// payment method end here - - -// complete page start here -.complete-page{ - width:880px; - height: 1050px; .order-summary { - - span { - font-size: 24px; - color: #242424; - font-weight: bold; - letter-spacing: -0.58px; + h3 { + font-size: 16px; } - } - .address { - display: flex; - flex-direction: row; - margin-top: 30px; + .item-detail { + margin-top:12px; - .shipping-address { - height: 100px; - width: 415px; - - .shipping-title { - - span { - font-weight: bold; - font-size: 16px; - color: #242424 - } - } - - .shipping-content { - margin-top: 15px; - width: 175px; - - .addr { - margin-top: 5px; - - span { - font-size: 16px; - color: #121212; - } - } - - .horizontal-rule { - margin-top: 7%; - width: 25px; - height: 1px; - vertical-align: middle; - background: #121212; - } - - .contact { - margin-top: 10px; - - span { - font-size: 16px; - color: #121212; - } + label { + &.right { + float: right; } } } - .billing-address { - width: 415px; + .payble-amount { + margin-top: 17px; + border-top: 1px solid $border-color; + padding-top: 12px; - .shipping-title { + label { + font-weight: bold; - span { - font-weight: bold; - font-size: 16px; - color: #242424 - } - } - - .shipping-content { - margin-top: 15px; - width: 175px; - - .addr { - margin-top: 5px; - - span { - font-size: 16px; - color: #121212; - } - } - - .horizontal-rule { - margin-top: 7%; - width: 25px; - height: 1px; - vertical-align: middle; - background: #121212; - } - - .contact { - margin-top: 10px; - - span { - font-size: 16px; - color: #121212; - } - } - } - } - } - - .product-detail { - height: 200px; - border: 1px solid #E8E8E8; - border-radius: 3px; - margin-top: 30px; - display: flex; - flex-direction: row; - - .product-image { - margin: 20px 0px 20px 20px; - - img { - height: 160px; - width:160px; - } - } - margin-top: 30px; - .product-desc { - margin-top: 20px; - margin-left: 10px; - - .product-title { - - span { - font-size: 18px; - color: #242424; - letter-spacing: -0.43px; - font-weight: bold; - } - } - - .price { - margin-top:11px; - - span { - - label { - font-size: 16px; - color: #5E5E5E; - } - - label.bold { - margin-left:45px; - font-weight: bold; - font-size: 18px; - color: #242424; - } - } - } - - .quantity { - margin-top:11px; - - span { - - label { - font-size: 16px; - color: #5E5E5E; - } - - label.quat-bold { - margin-left:15px; - font-weight: bold; - font-size: 18px; - color: #242424; - } - } - } - - .pro-attribute { - width:413px; - margin-top:14px; - - span { - - font-size: 16px; - color: #242424; - } - } - } - } - - .order-description { - height: 140px; - border-radius: 3px; - margin-top: 30px; - display: flex; - flex-direction: row; - justify-content: space-between; - - .payment { - - .shipping{ - display: flex; - flex-direction: row; - - .pay-icon { - height: 48px; - width: 48px; - border-radius: 50%; - border: 1px solid #E8E8E8; - - img { - margin-left: 8px; - margin-top: 8px; - } - - span { - margin-left: 10px; - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; - } - } - - .shipping-text { - display: flex; - flex-direction: column; - - .price { - margin-top: 5px; - margin-left: 5px; - - span { - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; - } - } - - .fedex-shipping { - margin-left: 5px; - - span { - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; - } - } - } - } - - .net-banking{ - margin-top: 23px; - display: flex; - flex-direction: row; - - .pay-icon { - height: 48px; - width: 48px; - border-radius: 50%; - border: 1px solid #E8E8E8; - - img { - margin-left: 8px; - margin-top: 8px; - } - } - - span { - margin-left: 5px; - margin-top: 15px; - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; - } - } - } - - .product-bill { - height:200px; - width:300px; - - .sub-total { - - span { - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; - } - - .right{ + &.right { float:right; } } - - .charge-discount { - margin-top: 10px; - - span { - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; - } - - .right{ - float:right; - } - } - - .horizontal-rule { - margin-top: 5%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; - } - - .amount-pay { - margin-top: 15px; - - span { - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; - } - - .right{ - float:right; - } - } - } - } - - .horizontal-rule { - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; - } - - .palce-order-button { - margin-top: 30px; - - button { - width:137px; - height: 38px; - background: #0031F0; - font-size: 14px; - color: #FFFFFF; - letter-spacing: -0.26px; - text-align: center; - border:none; } } } -// complete page end here - +// checkout ends here // review page start here section.review { - font-size: 16px; - color: $product-font-color; + color: $font-color; .category-breadcrumbs { display: inline; @@ -4094,7 +3360,6 @@ section.review { span { font-size: 24px; - color: #242424; letter-spacing: -0.58px; } } @@ -4110,15 +3375,12 @@ section.review { .pro-price-not { margin-left: 10px; - font-size: 16px; color: #A5A5A5; letter-spacing: -0.26px; } .offer { margin-left: 10px; - font-size: 16px; - color: #242424; letter-spacing: -0.26px; } } @@ -4132,8 +3394,6 @@ section.review { margin-top: 10px; span { - font-size: 16px; - color: #242424; letter-spacing: -0.26px; } @@ -4145,7 +3405,6 @@ section.review { .rating { margin-top : 25px; - font-size: 16px; color: #5E5E5E; letter-spacing: -0.12px; @@ -4191,7 +3450,7 @@ section.review { margin-top: 10px; button { - background: #0031F0; + background: $brand-color; font-size: 14px; color: #FFFFFF; letter-spacing: -0.26px; @@ -4218,7 +3477,6 @@ section.review { span { font-size: 34px; - color: #242424; letter-spacing: -0.82px; text-align: center; } @@ -4236,12 +3494,10 @@ section.review { } } } - // review page end here // customer section css start here - .cusomer-section { margin-left: 50px; width:100%; @@ -4249,7 +3505,7 @@ section.review { .customer-section-info { display: flex; flex-direction: row; - border-top: 1px solid #E8E8E8; + border-top: 1px solid $border-color; .pro-img { margin-top: 10px; @@ -4266,8 +3522,7 @@ section.review { width: 100%; .title { - font-size: 16px; - color: #0031F0; + color: $brand-color; margin-top: 15px; } @@ -4287,8 +3542,7 @@ section.review { } .customer-section-info:last-child { - border-bottom: 1px solid #e8e8e8; + border-bottom: 1px solid $border-color; } } - // customer section css end here \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss index d4c2de509..df3227acc 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss @@ -53,4 +53,16 @@ background-image:URL('../images/icon-share.svg'); width: 24px; height: 24px; +} + +.shipping-icon { + background-image: url('../images/shipping.svg'); + width: 32px; + height: 32px; +} + +.payment-icon { + background-image: url('../images/payment.svg'); + width: 32px; + height: 32px; } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index af33d2f71..736b6ba5e 100644 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -87,7 +87,10 @@ return [ 'use_for_shipping' => 'Ship to this address', 'continue' => 'Continue', 'shipping-method' => 'Shipping Method', - 'payment-information' => 'Payment Information' + 'payment-information' => 'Payment Information', + 'summary' => 'Summary of Order', + 'price' => 'Price', + 'quantity' => 'Quantity' ], 'total' => [ diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php index 361731c3b..0b21826d7 100644 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php @@ -20,51 +20,55 @@
- @foreach($cart->items as $item) +
+ @foreach($cart->items as $item) - product; + product; - $productBaseImage = $productImageHelper->getProductBaseImage($product); - ?> + $productBaseImage = $productImageHelper->getProductBaseImage($product); + ?> + +
+
+ +
+ +
+ +
+ {{ $product->name }} +
+ +
+ + {{ $item->price }} + + + $25.00 + + + 10% Off + +
+ +
+ Color : Gray, Size : S +
+ +
+
Quantity
+
{{ $item->quantity }}
+ Remove + Move to Wishlist +
+
-
-
-
+ @endforeach -
- -
- {{ $product->name }} -
- -
- - {{ $item->price }} - - - $25.00 - - - 10% Off - -
- -
- Color : Gray, Size : S -
- -
-
Quantity
-
{{ $item->quantity }}
- Remove - Move to Wishlist -
-
- -
- @endforeach +
+
Continue Shopping @@ -73,6 +77,7 @@
+
Price Detail @@ -94,6 +99,7 @@
+
Apply Coupon diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php index 40db17f16..6ca9b95ea 100644 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php @@ -1,190 +1,127 @@ -
-
- Summary of Order +
+
+

{{ __('shop::app.checkout.onepage.summary') }}

-
-
+
+
Shipping address
-
-
- John Doe -
-
- - 25 , Washington USA 5751434 - -
-
-
-
- Contact : 9876543210 -
+
+ John Doe
+ 25 , Washington
+ USA 5751434
+ + + + Contact : 9876543210
-
-
+
+
Billing address
-
-
- John Doe -
-
- - 25 , Washington USA 5751434 - -
-
-
-
- Contact : 9876543210 -
+
+ John Doe
+ 25 , Washington
+ USA 5751434
+ + + + Contact : 9876543210
-
-
- -
+ @inject ('productImageHelper', 'Webkul\Product\Product\ProductImage') -
-
- - Rainbow creation Embroidered - -
-
- - - - -
-
- - - - -
-
- - Color : Grey, Size : S,Sleeve Type : Puffed Sleeves,Occasion : Birthday ,Marriage Anniversary - -
-
-
+
+ @foreach($cart->items as $item) -
-
- -
+ product; + + $productBaseImage = $productImageHelper->getProductBaseImage($product); + ?> + +
+
+ +
+ +
+ +
+ {{ $product->name }} +
+ +
+ + {{ __('shop::app.checkout.onepage.price') }} + + + {{ core()->currency($item->base_price) }} + +
+ +
+ + {{ __('shop::app.checkout.onepage.quantity') }} + + + {{ $item->quantity }} + +
+ +
+ Color : Gray, Size : S +
+
-
-
- - Rainbow creation Embroidered -
-
- - - - -
-
- - - - -
-
- - Color : Grey, Size : S,Sleeve Type : Puffed Sleeves,Occasion : Birthday ,Marriage Anniversary - -
-
+ @endforeach +
-
+
-
- +
+
-
-
- - $ 25.00 - -
-
- - FedEx Shipping - +
+ $ 25.00 + +
+ FedEx Shipping
-
-
- +
+
+ +
+ +
+ Net banking
- Net banking
-
+
-
- - Subtotal - - - $ 2,506.00 - -
- -
- - Delivery Charges - - - $ 40.00 - -
- -
- - Coupan discount - - - $ 25.00 - -
- -
-
- -
- - Amount payable - - - $ 2,571.00 - -
+ @include('shop::checkout.total.summary', ['cart' => $cart])
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index 5f598bbd9..11aa1ca18 100644 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -1,31 +1,20 @@
-
- {{ __('shop::app.checkout.total.order-summary') }} -
+

{{ __('shop::app.checkout.total.order-summary') }}

- - - - + +
@if ($cart->selected_shipping_rate)
- - - - + +
@endif -
-
-
- - - - + +
\ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/customers/checkout/common/common.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/checkout/common/common.blade.php deleted file mode 100644 index 68186c19b..000000000 --- a/packages/Webkul/Shop/src/Resources/views/customers/checkout/common/common.blade.php +++ /dev/null @@ -1,8 +0,0 @@ -
- - @include('shop::customers.checkout.common.nav-left') - - @include('shop::customers.checkout.common.nav-right') - -
- diff --git a/packages/Webkul/Shop/src/Resources/views/customers/checkout/common/nav-left.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/checkout/common/nav-left.blade.php deleted file mode 100644 index 2a33dfe10..000000000 --- a/packages/Webkul/Shop/src/Resources/views/customers/checkout/common/nav-left.blade.php +++ /dev/null @@ -1,53 +0,0 @@ -
-
- -
    - -
  • -
    -
    - -
    - - Information - -
    - -
    • - -
  • -
    -
    - -
    - - Shipping -
    -
    • - -
  • -
    -
    - -
    - - Payment -
    -
    • - -
  • -
    -
    - -
    - - Complete -
    -
    • -
- -
-
-
-
- diff --git a/packages/Webkul/Shop/src/Resources/views/customers/checkout/common/nav-right.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/checkout/common/nav-right.blade.php deleted file mode 100644 index 35d745c8c..000000000 --- a/packages/Webkul/Shop/src/Resources/views/customers/checkout/common/nav-right.blade.php +++ /dev/null @@ -1,3 +0,0 @@ -
- -
\ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/customers/checkout/complete.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/checkout/complete.blade.php deleted file mode 100644 index 6f9d4b8e2..000000000 --- a/packages/Webkul/Shop/src/Resources/views/customers/checkout/complete.blade.php +++ /dev/null @@ -1,265 +0,0 @@ - -@extends('shop::layouts.master') - -@section('content-wrapper') - - -
- -
-
- -
    - -
  • -
    -
    - -
    - - Information -
    - -
    • - -
  • -
    -
    - -
    - - Shipping -
    -
    • - -
  • -
    -
    - -
    - - Payment -
    -
    • - -
  • -
    -
    - -
    - - Complete -
    -
    • -
- -
-
-
-
- - -
- -
-
- Summary of Order -
- -
- -
-
- Shipping address -
- -
-
- John Doe -
-
- - 25 , Washington USA 5751434 - -
-
-
-
- Contact : 9876543210 -
-
-
- -
-
- Billing address -
- -
-
- John Doe -
-
- - 25 , Washington USA 5751434 - -
-
-
-
- Contact : 9876543210 -
-
-
- -
- -
-
- -
- -
-
- - Rainbow creation Embroidered - -
-
- - - - -
-
- - - - -
-
- - Color : Grey, Size : S,Sleeve Type : Puffed Sleeves,Occasion : Birthday ,Marriage Anniversary - -
-
-
- -
-
- -
- -
-
- - Rainbow creation Embroidered - -
-
- - - - -
-
- - - - -
-
- - Color : Grey, Size : S,Sleeve Type : Puffed Sleeves,Occasion : Birthday ,Marriage Anniversary - -
-
-
- -
- -
- -
-
- -
-
-
- - $ 25.00 - -
- -
- - FedEx Shipping - -
-
-
- -
-
- -
- Net banking -
- -
- -
- -
- - Subtotal - - - $ 2,506.00 - -
- -
- - Delivery Charges - - - $ 40.00 - -
- -
- - Coupan discount - - - $ 25.00 - -
- -
-
- -
- - Amount payable - - - $ 2,571.00 - -
- -
- -
- -
-
- -
- -
- -
- -@endsection \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/customers/checkout/guest.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/checkout/guest.blade.php deleted file mode 100644 index 475c06621..000000000 --- a/packages/Webkul/Shop/src/Resources/views/customers/checkout/guest.blade.php +++ /dev/null @@ -1,73 +0,0 @@ -
-
- - Order as Guest - - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- qwdevf - Usedifferent address for billing? -
- -
-
- -
- -
- -
\ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/customers/checkout/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/checkout/index.blade.php deleted file mode 100644 index d257eedbb..000000000 --- a/packages/Webkul/Shop/src/Resources/views/customers/checkout/index.blade.php +++ /dev/null @@ -1,66 +0,0 @@ -@extends('shop::layouts.master') - -@section('content-wrapper') - - - -@endsection - -@push('scripts') - - - - - - - -@endpush - - - diff --git a/packages/Webkul/Shop/src/Resources/views/customers/checkout/payment-method.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/checkout/payment-method.blade.php deleted file mode 100644 index 5eda20d85..000000000 --- a/packages/Webkul/Shop/src/Resources/views/customers/checkout/payment-method.blade.php +++ /dev/null @@ -1,57 +0,0 @@ - -@extends('shop::layouts.master') - -@section('content-wrapper') - -@include('shop::customers.checkout.common.common') - -
-
- - Payment Method - -
- -
-
- - Cash on Delivery -
-
- Fadex - - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut. -
-
- -
-
- - Net Banking -
-
- Fadex - - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut. -
-
- -
-
- - Debit / Credit Card -
-
- Fadex - - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut. -
-
- - -
-
- -
- -
-
- -@endsection \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/customers/checkout/ship-method.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/checkout/ship-method.blade.php deleted file mode 100644 index b0303e15d..000000000 --- a/packages/Webkul/Shop/src/Resources/views/customers/checkout/ship-method.blade.php +++ /dev/null @@ -1,52 +0,0 @@ - - -
-
- - Shipment Method - -
- -
-
- {{-- --}} - - $ 25.00 -
-
- Fadex - - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut. -
-
- -
-
- - $ 25.00 -
-
- Fadex - - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut. -
-
- -
-
- - $ 25.00 -
-
- Fadex - - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut. -
-
- - -
-
- -
- -
-
- diff --git a/packages/Webkul/Shop/src/Resources/views/customers/checkout/signin.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/checkout/signin.blade.php deleted file mode 100644 index 6d550259e..000000000 --- a/packages/Webkul/Shop/src/Resources/views/customers/checkout/signin.blade.php +++ /dev/null @@ -1,40 +0,0 @@ - -@extends('shop::layouts.master') - -@section('content-wrapper') - -@include('shop::customers.checkout.common') - - - -@endsection \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php index 143fc99f6..129790e8b 100644 --- a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php @@ -21,6 +21,8 @@
+ +
@include('shop::layouts.header.index') diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index 660585c3c..d341e82b8 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -55,6 +55,18 @@ height: 24px; } +.shipping-icon { + background-image: url("../images/shipping.svg"); + width: 32px; + height: 32px; +} + +.payment-icon { + background-image: url("../images/payment.svg"); + width: 32px; + height: 32px; +} + body { margin: 0; padding: 0; @@ -289,7 +301,6 @@ body { margin-right: auto; border-top: 1px solid lightgrey; border-bottom: 1px solid lightgrey; - font-size: 16px; display: block; /* submenu positioning*/ } @@ -462,8 +473,8 @@ body { display: none; } .header .search-suggestion .search-content { - border-top: 1px solid #e8e8e8; - border-bottom: 1px solid #e8e8e8; + border-top: 1px solid #c7c7c7; + border-bottom: 1px solid #c7c7c7; height: 48px; } .header .search-suggestion .search-content .icon.search-icon { @@ -471,8 +482,6 @@ body { margin-top: 12px; } .header .search-suggestion .search-content span { - font-size: 16px; - color: #242424; margin-bottom: -7px; margin-left: 5px; } @@ -484,11 +493,9 @@ body { margin-top: 14px; height: 32px; margin-bottom: 14px; - border-bottom: 1px solid #e8e8e8; + border-bottom: 1px solid #c7c7c7; } .header .search-suggestion .suggestion span { - font-size: 16px; - color: #242424; margin-left: 48px; } .header .header-bottom { @@ -506,7 +513,7 @@ body { } .header .header-bottom .nav > li { float: none; - border-bottom: 1px solid #e8e8e8; + border-bottom: 1px solid #c7c7c7; } .header .header-bottom .nav > li a { margin-left: 10px; @@ -517,13 +524,12 @@ body { margin-right: 5px; } .header .header-bottom .nav > li:first-child { - border-top: 1px solid #e8e8e8; + border-top: 1px solid #c7c7c7; } .header .header-bottom .nav > li:last-child { float: none; } .header .header-bottom .nav > li:last-child span { - font-size: 16px; color: #FF6472; letter-spacing: -0.38px; } @@ -628,7 +634,7 @@ body { } .header .header-bottom .nav > li { float: none; - border-bottom: 1px solid #e8e8e8; + border-bottom: 1px solid #c7c7c7; } .header .header-bottom .nav > li a { margin-left: 10px; @@ -639,13 +645,12 @@ body { margin-right: 5px; } .header .header-bottom .nav > li:first-child { - border-top: 1px solid #e8e8e8; + border-top: 1px solid #c7c7c7; } .header .header-bottom .nav > li:last-child { float: none; } .header .header-bottom .nav > li:last-child span { - font-size: 16px; color: #FF6472; letter-spacing: -0.38px; } @@ -744,7 +749,7 @@ section.slider-block div.slider-content div.slider-control { } section.slider-block div.slider-content div.slider-control .dark-left-icon { - background-color: #ffffff; + background-color: #f2f2f2; height: 48px; width: 48px; max-height: 100%; @@ -752,7 +757,7 @@ section.slider-block div.slider-content div.slider-control .dark-left-icon { } section.slider-block div.slider-content div.slider-control .light-right-icon { - background-color: black; + background-color: #000; height: 48px; width: 48px; max-height: 100%; @@ -767,20 +772,18 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { } .layered-filter-wrapper .filter-title { - border-bottom: 1px solid #E8E8E8; - font-size: 16px; + border-bottom: 1px solid #c7c7c7; color: #242424; padding: 10px 0; } .layered-filter-wrapper .filter-attributes .filter-attributes-item { - border-bottom: 1px solid #E8E8E8; + border-bottom: 1px solid #c7c7c7; padding-bottom: 10px; } .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title { padding: 10px 40px 0 10px; - font-size: 16px; color: #5E5E5E; cursor: pointer; position: relative; @@ -788,7 +791,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link { font-weight: 400; - color: #0031F0; + color: #0031f0; margin-right: 10px; } @@ -814,7 +817,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item { padding: 8px 0; - font-size: 16px; color: #5E5E5E; } @@ -893,7 +895,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { } .main-container-wrapper .product-card .product-name { - font-size: 16px; margin-bottom: 14px; width: 100%; color: #242424; @@ -904,7 +905,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { } .main-container-wrapper .product-card .product-description { - font-size: 16px; margin-bottom: 14px; display: none; } @@ -991,7 +991,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { } .main-container-wrapper .top-toolbar .pager label { - font-size: 16px; margin-right: 5px; } @@ -999,7 +998,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { background: #FFFFFF; border: 1px solid #C7C7C7; border-radius: 3px; - font-size: 16px; color: #242424; padding: 10px; } @@ -1146,7 +1144,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { font-size: 12px; } .main-container-wrapper .top-toolbar { - border-bottom: 1px solid #E8E8E8; + border-bottom: 1px solid #c7c7c7; margin-bottom: 10px; } .main-container-wrapper .top-toolbar .page-info span:first-child { @@ -1182,7 +1180,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { background: #FFFFFF; border: 1px solid #C7C7C7; border-radius: 3px; - font-size: 16px; color: #242424; padding: 10px; } @@ -1221,7 +1218,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { font-size: 12px; } .main-container-wrapper .top-toolbar { - border-bottom: 1px solid #E8E8E8; + border-bottom: 1px solid #c7c7c7; margin-bottom: 10px; } .main-container-wrapper .top-toolbar .page-info span:first-child { @@ -1257,7 +1254,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { background: #FFFFFF; border: 1px solid #C7C7C7; border-radius: 3px; - font-size: 16px; color: #242424; padding: 10px; } @@ -1267,7 +1263,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { } .product-price { - font-size: 16px; margin-bottom: 14px; width: 100%; font-weight: 600; @@ -1279,14 +1274,12 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { } .product-price .regular-price { - font-size: 16px; color: #A5A5A5; text-decoration: line-through; margin-right: 10px; } .product-price .special-price { - font-size: 16px; color: #FF6472; } @@ -1308,7 +1301,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { } .footer .footer-content .footer-list-container .list-container .list-heading { - font-size: 16px; letter-spacing: -0.26px; text-transform: uppercase; color: #a5a5a5; @@ -1320,7 +1312,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { .footer .footer-content .footer-list-container .list-container .list-group li { margin-bottom: 12px; - color: #242424; list-style-type: none; text-transform: uppercase; } @@ -1359,7 +1350,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { } .footer .footer-content .footer-list-container .list-container .form-container .control-group .btn-primary { - background-color: black; + background-color: #000; margin-top: 8px; border-radius: 0px; text-align: center; @@ -1387,7 +1378,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { display: -webkit-box; display: -ms-flexbox; display: flex; - background: #ffffff; + background: #f2f2f2; border: 1px solid #c7c7c7; -webkit-box-orient: vertical; -webkit-box-direction: normal; @@ -1463,17 +1454,15 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { -webkit-box-pack: start; -ms-flex-pack: start; justify-content: flex-start; - border: 1px solid #e8e8e8; - background: #ffffff; + border: 1px solid #c7c7c7; + background: #f2f2f2; width: 25%; height: 100%; text-transform: capitalize; - font-size: 16px; color: #5e5e5e; } .account-content .account-side-menu li { - font-size: 16px; width: 95%; height: 50px; margin-left: 5%; @@ -1532,11 +1521,10 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { width: 100%; height: 1px; vertical-align: middle; - background: #e8e8e8; + background: #c7c7c7; } .account-content .profile-content { - font-size: 16px; color: #5e5e5e; margin-top: 1.4%; } @@ -1567,7 +1555,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { display: -webkit-box; display: -ms-flexbox; display: flex; - background: #ffffff; + background: #f2f2f2; border: 1px solid #c7c7c7; -webkit-box-orient: vertical; -webkit-box-direction: normal; @@ -1578,7 +1566,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { } section.product-detail { - font-size: 16px; color: #242424; } @@ -1794,7 +1781,6 @@ section.product-detail div.layouter form .details .full-specifications td:first- } section.product-detail div.layouter form .details .accordian .accordian-header { - font-size: 16px; padding-left: 0; font-weight: 600; } @@ -1809,10 +1795,6 @@ section.product-detail div.layouter form .details .attributes { border-bottom: solid 1px rgba(162, 162, 162, 0.2); } -section.product-detail div.layouter form .details .full-description { - font-size: 16px; -} - @media all and (max-width: 480px) { section.product-detail div.category-breadcrumbs { display: none; @@ -1855,7 +1837,7 @@ section.product-detail div.layouter form .details .full-description { section.product-detail div.layouter form .details { width: 100%; margin-top: 20px; - border-bottom: 1px solid #e8e8e8e8; + border-bottom: 1px solid #c7c7c7; } section.product-detail div.layouter form .details .attributes { border-bottom: none; @@ -1904,7 +1886,7 @@ section.product-detail div.layouter form .details .full-description { section.product-detail div.layouter form .details { width: 100%; margin-top: 20px; - border-bottom: 1px solid #e8e8e8e8; + border-bottom: 1px solid #c7c7c7; } section.product-detail div.layouter form .details .attributes { border-bottom: none; @@ -1980,7 +1962,6 @@ section.product-detail div.layouter form .details .full-description { /* cart pages and elements css begins here */ section.cart { color: #242424; - font-size: 16px; margin-bottom: 80px; } @@ -2000,12 +1981,115 @@ section.cart .cart-content { flex-direction: row; } -section.cart .cart-content .left-side { +.cart .left-side { width: 68.6%; margin-right: 2.4%; } -section.cart .cart-content .left-side .item { +.cart .right-side { + width: 29%; + display: block; +} + +.cart .right-side .price-section { + width: 100%; + padding: 10px 10px 18px 18px; + margin-bottom: 20px; +} + +.cart .right-side .price-section .title { + font-weight: bold; + padding-bottom: 8px; + margin-bottom: 10px; +} + +.cart .right-side .price-section .all-item-details { + margin-bottom: 17px; +} + +.cart .right-side .price-section .all-item-details .item-details { + margin-bottom: 10px; +} + +.cart .right-side .price-section .all-item-details .item-details .price { + float: right; +} + +.cart .right-side .price-section .horizontal-rule { + width: 100%; + height: 1px; + vertical-align: middle; + background: #c7c7c7; +} + +.cart .right-side .price-section .total-details { + margin-top: 10px; +} + +.cart .right-side .price-section .total-details .amount { + float: right; +} + +.cart .right-side .coupon-section { + padding: 10px 10px 18px 18px; +} + +.cart .right-side .coupon-section .title { + font-weight: bold; + margin-bottom: 10px; +} + +.cart .right-side .coupon-section .control-group { + margin-bottom: 12px !important; +} + +.cart .right-side .coupon-section .control-group input.coupon-input::-moz-placeholder { + font-family: "montserrat", sans-serif; + color: #242424; +} + +.cart .right-side .coupon-section .control-group input.coupon-input::-webkit-input-placeholder { + font-family: "montserrat", sans-serif; + color: #242424; +} + +.cart .right-side .coupon-section button { + margin-bottom: 10px; + background-color: #000; + border-radius: 0px; +} + +.cart .right-side .coupon-section .coupon-details .coupon { + margin-bottom: 8px; +} + +.cart .right-side .coupon-section .coupon-details .coupon .discount { + float: right; +} + +.cart .right-side .coupon-section .horizontal-rule { + width: 100%; + height: 1px; + vertical-align: middle; + background: #c7c7c7; + margin-bottom: 9px; +} + +.cart .right-side .coupon-section .after-coupon-amount .name { + font-weight: bold; +} + +.cart .right-side .coupon-section .after-coupon-amount .amount { + float: right; + font-weight: bold; +} + +.cart-item-list { + margin-top: 21px; + padding: 1px; +} + +.cart-item-list .item { padding: 1.1%; margin-bottom: 20px; display: -webkit-box; @@ -2017,12 +2101,12 @@ section.cart .cart-content .left-side .item { flex-direction: row; } -section.cart .cart-content .left-side .item .item-image { +.cart-item-list .item .item-image { height: 160px; width: 160px; } -section.cart .cart-content .left-side .item .item-details { +.cart-item-list .item .item-details { display: -webkit-box; display: -ms-flexbox; display: flex; @@ -2032,35 +2116,35 @@ section.cart .cart-content .left-side .item .item-details { flex-direction: column; } -section.cart .cart-content .left-side .item .item-details .item-title { +.cart-item-list .item .item-details .item-title { font-size: 18px; margin-bottom: 10px; } -section.cart .cart-content .left-side .item .item-details .price { +.cart-item-list .item .item-details .price { margin-bottom: 10px; } -section.cart .cart-content .left-side .item .item-details .price .main-price { +.cart-item-list .item .item-details .price .main-price { font-size: 18px; margin-right: 4px; } -section.cart .cart-content .left-side .item .item-details .price .real-price { +.cart-item-list .item .item-details .price .real-price { margin-right: 4px; -webkit-text-decoration-line: line-through; text-decoration-line: line-through; } -section.cart .cart-content .left-side .item .item-details .price .discount { +.cart-item-list .item .item-details .price .discount { color: #FF6472; } -section.cart .cart-content .left-side .item .item-details .summary { +.cart-item-list .item .item-details .summary { margin-bottom: 17px; } -section.cart .cart-content .left-side .item .item-details .misc { +.cart-item-list .item .item-details .misc { display: -webkit-inline-box; display: -ms-inline-flexbox; display: inline-flex; @@ -2072,12 +2156,12 @@ section.cart .cart-content .left-side .item .item-details .misc { justify-content: flex-start; } -section.cart .cart-content .left-side .item .item-details .misc div.qty-text { +.cart-item-list .item .item-details .misc div.qty-text { color: #5E5E5E; margin-right: 10px; } -section.cart .cart-content .left-side .item .item-details .misc div.box { +.cart-item-list .item .item-details .misc div.box { height: 38px; width: 60px; text-align: center; @@ -2087,129 +2171,27 @@ section.cart .cart-content .left-side .item .item-details .misc div.box { margin-right: 30px; } -section.cart .cart-content .left-side .item .item-details .misc .remove { - color: #0031F0; +.cart-item-list .item .item-details .misc .remove { + color: #0031f0; margin-right: 30px; } -section.cart .cart-content .left-side .item .item-details .misc .towishlist { - color: #0031F0; +.cart-item-list .item .item-details .misc .towishlist { + color: #0031f0; } -section.cart .cart-content .left-side .misc-controls { +.cart-item-list .misc-controls { float: right; } -section.cart .cart-content .left-side .misc-controls span { +.cart-item-list .misc-controls span { margin-right: 15px; } -section.cart .cart-content .left-side .misc-controls button { +.cart-item-list .misc-controls button { border-radius: 0px; } -section.cart .cart-content .right-side { - width: 29%; - display: block; -} - -section.cart .cart-content .right-side .price-section { - width: 100%; - padding: 10px 10px 18px 18px; - margin-bottom: 20px; -} - -section.cart .cart-content .right-side .price-section .title { - font-size: 16px; - font-weight: bold; - padding-bottom: 8px; - margin-bottom: 10px; -} - -section.cart .cart-content .right-side .price-section .all-item-details { - margin-bottom: 17px; -} - -section.cart .cart-content .right-side .price-section .all-item-details .item-details { - margin-bottom: 10px; -} - -section.cart .cart-content .right-side .price-section .all-item-details .item-details .price { - float: right; -} - -section.cart .cart-content .right-side .price-section .horizontal-rule { - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; -} - -section.cart .cart-content .right-side .price-section .total-details { - margin-top: 10px; -} - -section.cart .cart-content .right-side .price-section .total-details .amount { - float: right; -} - -section.cart .cart-content .right-side .coupon-section { - padding: 10px 10px 18px 18px; -} - -section.cart .cart-content .right-side .coupon-section .title { - font-size: 16px; - font-weight: bold; - margin-bottom: 10px; -} - -section.cart .cart-content .right-side .coupon-section .control-group { - margin-bottom: 12px !important; -} - -section.cart .cart-content .right-side .coupon-section .control-group input.coupon-input::-moz-placeholder { - font-family: "montserrat", sans-serif; - font-size: 16px; - color: #242424; -} - -section.cart .cart-content .right-side .coupon-section .control-group input.coupon-input::-webkit-input-placeholder { - font-family: "montserrat", sans-serif; - font-size: 16px; - color: #242424; -} - -section.cart .cart-content .right-side .coupon-section button { - margin-bottom: 10px; - background-color: black; - border-radius: 0px; -} - -section.cart .cart-content .right-side .coupon-section .coupon-details .coupon { - margin-bottom: 8px; -} - -section.cart .cart-content .right-side .coupon-section .coupon-details .coupon .discount { - float: right; -} - -section.cart .cart-content .right-side .coupon-section .horizontal-rule { - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; - margin-bottom: 9px; -} - -section.cart .cart-content .right-side .coupon-section .after-coupon-amount .name { - font-weight: bold; -} - -section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amount { - float: right; - font-weight: bold; -} - .attached-products-wrapper { margin-bottom: 80px; } @@ -2273,7 +2255,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo .order .order-section-head .order-number { font-size: 28px; - color: #242424; text-transform: capitalize; text-align: left; } @@ -2301,7 +2282,7 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo width: 100%; height: 1px; vertical-align: middle; - background: #e8e8e8; + background: #c7c7c7; } .order .order-section-head-small { @@ -2309,7 +2290,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo } .order .payment-place { - font-size: 16px; color: #5e5e5e; margin-top: 1.4%; } @@ -2331,7 +2311,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo .order .payment-place .placed-on .place-text span { color: #5E5E5E; letter-spacing: -0.12px; - font-size: 16px; } .order .payment-place .placed-on .place-text .processing { @@ -2341,7 +2320,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo .order .payment-place .placed-on .place-date span { color: #5E5E5E; letter-spacing: -0.12px; - font-size: 16px; } .order .payment-place .payment-status { @@ -2362,13 +2340,11 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo .order .payment-place .payment-status .payment-text span { color: #5E5E5E; letter-spacing: -0.12px; - font-size: 16px; } .order .payment-place .payment-status .status span { color: #5E5E5E; letter-spacing: -0.12px; - font-size: 16px; } .order .payment-place .horizontal-rule { @@ -2376,7 +2352,7 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo width: 100%; height: 1px; vertical-align: middle; - background: #e8e8e8; + background: #c7c7c7; } .order .order-details { @@ -2510,7 +2486,7 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo width: 100%; height: 1px; vertical-align: middle; - background: #e8e8e8; + background: #c7c7c7; } .order .order-information { @@ -2537,7 +2513,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo } .order .order-information p { - font-size: 16px; color: #3A3A3A; } @@ -2564,8 +2539,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo } .order .order-section-head-small .order-number { text-align: center; - font-size: 16px; - color: #242424; letter-spacing: -0.38px; text-align: center; margin-top: 13px; @@ -2575,19 +2548,18 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo float: right; text-align: right; font-size: 17px; - color: #0031F0; + color: #0031f0; letter-spacing: -0.11px; margin-top: 13px; margin-bottom: 13px; } .order .order-section-head-small .horizon-rule { - border: .5px solid #E8E8E8; + border: 0.5px solid #c7c7c7; width: 150%; margin-left: -10%; margin-right: -10%; } .order .payment-place { - font-size: 16px; color: #5e5e5e; margin-top: 4%; } @@ -2644,7 +2616,7 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo width: 100%; height: 1px; vertical-align: middle; - background: #e8e8e8; + background: #c7c7c7; } .order .order-details { display: none; @@ -2715,7 +2687,7 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo display: none; } .order .product-config { - border: 1px solid #E8E8E8; + border: 1px solid #c7c7c7; height: 19%; width: 100%; margin-top: 10px; @@ -2745,7 +2717,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo width: 50%; } .order .product-config .product-attribute .property-name span { - font-size: 16px; color: #5E5E5E; letter-spacing: -0.11px; } @@ -2792,8 +2763,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo } .order .order-section-head-small .order-number { text-align: center; - font-size: 16px; - color: #242424; letter-spacing: -0.38px; text-align: center; margin-top: 13px; @@ -2803,19 +2772,18 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo float: right; text-align: right; font-size: 17px; - color: #0031F0; + color: #0031f0; letter-spacing: -0.11px; margin-top: 13px; margin-bottom: 13px; } .order .order-section-head-small .horizon-rule { - border: .5px solid #E8E8E8; + border: 0.5px solid #c7c7c7; width: 150%; margin-left: -10%; margin-right: -10%; } .order .payment-place { - font-size: 16px; color: #5e5e5e; margin-top: 4%; } @@ -2872,7 +2840,7 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo width: 100%; height: 1px; vertical-align: middle; - background: #e8e8e8; + background: #c7c7c7; } .order .order-details { display: none; @@ -2943,7 +2911,7 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo display: none; } .order .product-config { - border: 1px solid #E8E8E8; + border: 1px solid #c7c7c7; height: 19%; width: 100%; margin-top: 10px; @@ -2973,7 +2941,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo width: 50%; } .order .product-config .product-attribute .property-name span { - font-size: 16px; color: #5E5E5E; letter-spacing: -0.11px; } @@ -3025,7 +2992,7 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo justify-content: space-between; width: 100%; padding-bottom: 15px; - border-bottom: 1px solid #E8E8E8; + border-bottom: 1px solid #c7c7c7; } .checkout-process .col-main ul.checkout-steps li { @@ -3043,7 +3010,7 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo display: -webkit-inline-box; display: -ms-inline-flexbox; display: inline-flex; - border: 1px solid #E8E8E8; + border: 1px solid #c7c7c7; background-repeat: no-repeat; background-position: center; } @@ -3076,7 +3043,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo margin-left: 7px; margin-top: auto; margin-bottom: auto; - font-size: 16px; } .checkout-process .col-main ul.checkout-steps li.active { @@ -3105,7 +3071,7 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo } .checkout-process .col-main .step-content .form-container { - border-bottom: 1px solid #E8E8E8; + border-bottom: 1px solid #c7c7c7; padding-top: 20px; padding-bottom: 20px; } @@ -3122,718 +3088,125 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo margin-left: 28px; } +.checkout-process .col-main .step-content .address { + display: inline-block; + width: 100%; +} + +.checkout-process .col-main .step-content .address .address-card { + width: 50%; +} + +.checkout-process .col-main .step-content .address .address-card.left { + float: left; +} + +.checkout-process .col-main .step-content .address .address-card.right { + float: right; +} + +.checkout-process .col-main .step-content .address .address-card .card-title span { + font-weight: 600; +} + +.checkout-process .col-main .step-content .address .address-card .card-content { + margin-top: 15px; + color: #121212; + line-height: 25px; +} + +.checkout-process .col-main .step-content .address .address-card .card-content .horizontal-rule { + margin: 12px 0; + display: block; + width: 25px; + background: #121212; +} + +.checkout-process .col-main .step-content .cart-item-list .item { + border: 1px solid #c7c7c7; + border-radius: 3px; + padding: 20px; +} + +.checkout-process .col-main .step-content .cart-item-list .item .row .title { + width: 100px; + display: inline-block; + color: #5E5E5E; + font-weight: 500; + margin-bottom: 10px; +} + +.checkout-process .col-main .step-content .cart-item-list .item .row .value { + font-size: 18px; + font-weight: 600; +} + +.checkout-process .col-main .step-content .order-description { + display: inline-block; + width: 100%; +} + +.checkout-process .col-main .step-content .order-description .shipping { + margin-bottom: 25px; +} + +.checkout-process .col-main .step-content .order-description .decorator { + height: 48px; + width: 48px; + border-radius: 50%; + border: 1px solid #c7c7c7; + vertical-align: middle; + display: inline-block; + text-align: center; +} + +.checkout-process .col-main .step-content .order-description .decorator .icon { + margin-top: 7px; +} + +.checkout-process .col-main .step-content .order-description .text { + font-weight: 600; + vertical-align: middle; + display: inline-block; +} + +.checkout-process .col-main .step-content .order-description .text .info { + font-weight: 500; + margin-top: 2px; +} + .checkout-process .col-right { width: 35%; padding-left: 40px; } -.checkout-process .col-right .order-summary .price span { - margin-left: 3px; +.checkout-process .order-summary h3 { font-size: 16px; - color: #242424; - font-weight: bold; } -.checkout-process .col-right .order-summary .item-detail { +.checkout-process .order-summary .item-detail { margin-top: 12px; } -.checkout-process .col-right .order-summary .item-detail span { - margin-left: 3px; -} - -.checkout-process .col-right .order-summary .item-detail span label { - font-size: 16px; - color: #242424; -} - -.checkout-process .col-right .order-summary .item-detail span .right { - float: right; - font-size: 16px; - color: #242424; -} - -.checkout-process .col-right .order-summary .horizontal-rule { - margin-top: 6%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; -} - -.checkout-process .col-right .order-summary .payble-amount { - margin-top: 12px; -} - -.checkout-process .col-right .order-summary .payble-amount span { - margin-left: 3px; - font-weight: bold; -} - -.checkout-process .col-right .order-summary .payble-amount span label { - font-size: 16px; - color: #242424; - font-weight: bold; -} - -.checkout-process .col-right .order-summary .payble-amount span .right { - float: right; - font-size: 16px; - color: #242424; -} - -@media all and (max-width: 480px) { - .checkout-process { - width: 100%; - margin-top: 3%; - } - .checkout-process .left-side { - width: 100%; - margin-right: 0%; - height: 60px; - } - .checkout-process .left-side .checkout-menu { - width: 100%; - } - .checkout-process .left-side .checkout-menu ul.checkout-detail { - height: 60px; - width: 100%; - padding: 5px; - } - .checkout-process .left-side .checkout-menu ul.checkout-detail li { - height: 48px; - } - .checkout-process .left-side .checkout-menu ul.checkout-detail li .wrapper { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - } - .checkout-process .left-side .checkout-menu ul.checkout-detail li .wrapper span { - display: none; - } - .checkout-process .left-side .checkout-menu ul.checkout-detail .line { - margin-top: 23px; - width: 100%; - margin-left: 5px; - margin-right: 5px; - border: 1px solid #E7E7E7; - height: 1px; - } - .checkout-process .left-side .checkout-menu .horizontal-rule { - display: none; - } - .checkout-process .right-side { - display: none; - } - .order-info { - width: 100%; - margin-right: 0%; - margin-top: 10px; - height: 50px; - } - .order-info .control-group .control { - width: 100%; - } - .order-info .different-billing-addr { - margin-top: 5%; - } - .order-info .horizontal-rule { - margin-top: 10%; - } - .order-info .countinue-button { - margin-top: 8%; - } -} - -@media all and (min-width: 481px) and (max-width: 920px) { - .checkout-process { - width: 100%; - margin-top: 3%; - } - .checkout-process .left-side { - width: 100%; - margin-right: 0%; - height: 60px; - } - .checkout-process .left-side .checkout-menu { - width: 100%; - } - .checkout-process .left-side .checkout-menu ul.checkout-detail { - height: 60px; - width: 100%; - padding: 5px; - } - .checkout-process .left-side .checkout-menu ul.checkout-detail li { - height: 48px; - } - .checkout-process .left-side .checkout-menu ul.checkout-detail li .wrapper { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - } - .checkout-process .left-side .checkout-menu ul.checkout-detail li .wrapper span { - display: none; - } - .checkout-process .left-side .checkout-menu ul.checkout-detail .line { - margin-top: 23px; - width: 100%; - margin-left: 10px; - margin-right: 10px; - border: 1px solid #E7E7E7; - height: 1px; - } - .checkout-process .left-side .checkout-menu .horizontal-rule { - display: none; - } - .checkout-process .right-side { - display: none; - } - .order-info { - width: 100%; - margin-right: 0%; - margin-top: 10px; - height: 50px; - } - .order-info .control-group .control { - width: 100%; - } - .order-info .different-billing-addr { - margin-top: 3%; - } - .order-info .horizontal-rule { - margin-top: 10%; - } - .order-info .countinue-button { - margin-top: 5%; - } -} - -.ship-method { - width: 67%; - margin-right: 6%; - height: 600px; - margin-top: -190px; -} - -.ship-method .ship-info .ship-text { - font-size: 24px; - color: #242424; - letter-spacing: -0.58px; - font-weight: bold; -} - -.ship-method .ship-price { - margin-top: 31px; -} - -.ship-method .ship-price .price-checkbox { - display: -webkit-box; - display: -ms-flexbox; - display: flex; -} - -.ship-method .ship-price .price-checkbox span { - margin-left: 8px; - font-size: 16px; - color: #242424; - line-height: 22px; - font-weight: bold; -} - -.ship-method .ship-price .price-checkbox-text { - margin-left: 25px; - width: 580px; - height: 44px; - margin-top: 4px; -} - -.ship-method .ship-price .price-checkbox-text b { - font-size: 16px; -} - -.ship-method .ship-price .price-checkbox-text span { - font-size: 16px; - color: #242424; - line-height: 22px; -} - -.ship-method .horizontal-rule { - margin-top: 7%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; -} - -.ship-method .countinue-button { - margin-top: 3%; -} - -.ship-method .countinue-button button { - background: #0031F0; - font-size: 14px; - color: #FFFFFF; - letter-spacing: -0.26px; - text-align: center; - height: 38px; - width: 137px; - border: none; -} - -.payment-method { - width: 67%; - margin-right: 6%; - height: 600px; - margin-top: -190px; -} - -.payment-method .payment-info .payment-text { - font-size: 24px; - color: #242424; - letter-spacing: -0.58px; - font-weight: bold; -} - -.payment-method .payment-price { - margin-top: 31px; -} - -.payment-method .payment-price .payment-checkbox { - display: -webkit-box; - display: -ms-flexbox; - display: flex; -} - -.payment-method .payment-price .payment-checkbox span { - margin-left: 8px; - font-size: 16px; - color: #242424; - line-height: 22px; - font-weight: bold; -} - -.payment-method .payment-price .payment-checkbox-text { - margin-left: 25px; - width: 580px; - height: 44px; - margin-top: 4px; -} - -.payment-method .payment-price .payment-checkbox-text b { - font-size: 16px; -} - -.payment-method .payment-price .payment-checkbox-text span { - font-size: 16px; - color: #242424; - line-height: 22px; -} - -.payment-method .horizontal-rule { - margin-top: 7%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; -} - -.payment-method .countinue-button { - margin-top: 3%; -} - -.payment-method .countinue-button button { - background: #0031F0; - font-size: 14px; - color: #FFFFFF; - letter-spacing: -0.26px; - text-align: center; - height: 38px; - width: 137px; - border: none; -} - -.payment-method .countinue-button button .horizontal-rule { - margin-top: 7%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; -} - -.payment-method .countinue-button button .horizontal-rule { - margin-top: 7%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; -} - -.complete-page { - width: 880px; - height: 1050px; -} - -.complete-page .order-summary span { - font-size: 24px; - color: #242424; - font-weight: bold; - letter-spacing: -0.58px; -} - -.complete-page .address { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: horizontal; - -webkit-box-direction: normal; - -ms-flex-direction: row; - flex-direction: row; - margin-top: 30px; -} - -.complete-page .address .shipping-address { - height: 100px; - width: 415px; -} - -.complete-page .address .shipping-address .shipping-title span { - font-weight: bold; - font-size: 16px; - color: #242424; -} - -.complete-page .address .shipping-address .shipping-content { - margin-top: 15px; - width: 175px; -} - -.complete-page .address .shipping-address .shipping-content .addr { - margin-top: 5px; -} - -.complete-page .address .shipping-address .shipping-content .addr span { - font-size: 16px; - color: #121212; -} - -.complete-page .address .shipping-address .shipping-content .horizontal-rule { - margin-top: 7%; - width: 25px; - height: 1px; - vertical-align: middle; - background: #121212; -} - -.complete-page .address .shipping-address .shipping-content .contact { - margin-top: 10px; -} - -.complete-page .address .shipping-address .shipping-content .contact span { - font-size: 16px; - color: #121212; -} - -.complete-page .address .billing-address { - width: 415px; -} - -.complete-page .address .billing-address .shipping-title span { - font-weight: bold; - font-size: 16px; - color: #242424; -} - -.complete-page .address .billing-address .shipping-content { - margin-top: 15px; - width: 175px; -} - -.complete-page .address .billing-address .shipping-content .addr { - margin-top: 5px; -} - -.complete-page .address .billing-address .shipping-content .addr span { - font-size: 16px; - color: #121212; -} - -.complete-page .address .billing-address .shipping-content .horizontal-rule { - margin-top: 7%; - width: 25px; - height: 1px; - vertical-align: middle; - background: #121212; -} - -.complete-page .address .billing-address .shipping-content .contact { - margin-top: 10px; -} - -.complete-page .address .billing-address .shipping-content .contact span { - font-size: 16px; - color: #121212; -} - -.complete-page .product-detail { - height: 200px; - border: 1px solid #E8E8E8; - border-radius: 3px; - margin-top: 30px; - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: horizontal; - -webkit-box-direction: normal; - -ms-flex-direction: row; - flex-direction: row; - margin-top: 30px; -} - -.complete-page .product-detail .product-image { - margin: 20px 0px 20px 20px; -} - -.complete-page .product-detail .product-image img { - height: 160px; - width: 160px; -} - -.complete-page .product-detail .product-desc { - margin-top: 20px; - margin-left: 10px; -} - -.complete-page .product-detail .product-desc .product-title span { - font-size: 18px; - color: #242424; - letter-spacing: -0.43px; - font-weight: bold; -} - -.complete-page .product-detail .product-desc .price { - margin-top: 11px; -} - -.complete-page .product-detail .product-desc .price span label { - font-size: 16px; - color: #5E5E5E; -} - -.complete-page .product-detail .product-desc .price span label.bold { - margin-left: 45px; - font-weight: bold; - font-size: 18px; - color: #242424; -} - -.complete-page .product-detail .product-desc .quantity { - margin-top: 11px; -} - -.complete-page .product-detail .product-desc .quantity span label { - font-size: 16px; - color: #5E5E5E; -} - -.complete-page .product-detail .product-desc .quantity span label.quat-bold { - margin-left: 15px; - font-weight: bold; - font-size: 18px; - color: #242424; -} - -.complete-page .product-detail .product-desc .pro-attribute { - width: 413px; - margin-top: 14px; -} - -.complete-page .product-detail .product-desc .pro-attribute span { - font-size: 16px; - color: #242424; -} - -.complete-page .order-description { - height: 140px; - border-radius: 3px; - margin-top: 30px; - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: horizontal; - -webkit-box-direction: normal; - -ms-flex-direction: row; - flex-direction: row; - -webkit-box-pack: justify; - -ms-flex-pack: justify; - justify-content: space-between; -} - -.complete-page .order-description .payment .shipping { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: horizontal; - -webkit-box-direction: normal; - -ms-flex-direction: row; - flex-direction: row; -} - -.complete-page .order-description .payment .shipping .pay-icon { - height: 48px; - width: 48px; - border-radius: 50%; - border: 1px solid #E8E8E8; -} - -.complete-page .order-description .payment .shipping .pay-icon img { - margin-left: 8px; - margin-top: 8px; -} - -.complete-page .order-description .payment .shipping .pay-icon span { - margin-left: 10px; - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; -} - -.complete-page .order-description .payment .shipping .shipping-text { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; -} - -.complete-page .order-description .payment .shipping .shipping-text .price { - margin-top: 5px; - margin-left: 5px; -} - -.complete-page .order-description .payment .shipping .shipping-text .price span { - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; -} - -.complete-page .order-description .payment .shipping .shipping-text .fedex-shipping { - margin-left: 5px; -} - -.complete-page .order-description .payment .shipping .shipping-text .fedex-shipping span { - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; -} - -.complete-page .order-description .payment .net-banking { - margin-top: 23px; - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: horizontal; - -webkit-box-direction: normal; - -ms-flex-direction: row; - flex-direction: row; -} - -.complete-page .order-description .payment .net-banking .pay-icon { - height: 48px; - width: 48px; - border-radius: 50%; - border: 1px solid #E8E8E8; -} - -.complete-page .order-description .payment .net-banking .pay-icon img { - margin-left: 8px; - margin-top: 8px; -} - -.complete-page .order-description .payment .net-banking span { - margin-left: 5px; - margin-top: 15px; - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; -} - -.complete-page .order-description .product-bill { - height: 200px; - width: 300px; -} - -.complete-page .order-description .product-bill .sub-total span { - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; -} - -.complete-page .order-description .product-bill .sub-total .right { +.checkout-process .order-summary .item-detail label.right { float: right; } -.complete-page .order-description .product-bill .charge-discount { - margin-top: 10px; +.checkout-process .order-summary .payble-amount { + margin-top: 17px; + border-top: 1px solid #c7c7c7; + padding-top: 12px; } -.complete-page .order-description .product-bill .charge-discount span { - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; +.checkout-process .order-summary .payble-amount label { + font-weight: bold; } -.complete-page .order-description .product-bill .charge-discount .right { +.checkout-process .order-summary .payble-amount label.right { float: right; } -.complete-page .order-description .product-bill .horizontal-rule { - margin-top: 5%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; -} - -.complete-page .order-description .product-bill .amount-pay { - margin-top: 15px; -} - -.complete-page .order-description .product-bill .amount-pay span { - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; -} - -.complete-page .order-description .product-bill .amount-pay .right { - float: right; -} - -.complete-page .horizontal-rule { - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; -} - -.complete-page .palce-order-button { - margin-top: 30px; -} - -.complete-page .palce-order-button button { - width: 137px; - height: 38px; - background: #0031F0; - font-size: 14px; - color: #FFFFFF; - letter-spacing: -0.26px; - text-align: center; - border: none; -} - section.review { - font-size: 16px; color: #242424; } @@ -3867,7 +3240,6 @@ section.review .review-layouter .product-info .heading { section.review .review-layouter .product-info .heading span { font-size: 24px; - color: #242424; letter-spacing: -0.58px; } @@ -3883,15 +3255,12 @@ section.review .review-layouter .product-info .price .pro-price { section.review .review-layouter .product-info .price .pro-price-not { margin-left: 10px; - font-size: 16px; color: #A5A5A5; letter-spacing: -0.26px; } section.review .review-layouter .product-info .price .offer { margin-left: 10px; - font-size: 16px; - color: #242424; letter-spacing: -0.26px; } @@ -3905,8 +3274,6 @@ section.review .review-layouter .review-info .heading { } section.review .review-layouter .review-info .heading span { - font-size: 16px; - color: #242424; letter-spacing: -0.26px; } @@ -3917,7 +3284,6 @@ section.review .review-layouter .review-info .heading .btn.btn-primary.right { section.review .review-layouter .review-info .rating { margin-top: 25px; - font-size: 16px; color: #5E5E5E; letter-spacing: -0.12px; } @@ -3963,7 +3329,7 @@ section.review .review-layouter .review-info .submit-button { } section.review .review-layouter .review-info .submit-button button { - background: #0031F0; + background: #0031f0; font-size: 14px; color: #FFFFFF; letter-spacing: -0.26px; @@ -3994,7 +3360,6 @@ section.review .review-layouter .review-info .review-detail .rating-review { section.review .review-layouter .review-info .review-detail .rating-review .avg-rating-count span { font-size: 34px; - color: #242424; letter-spacing: -0.82px; text-align: center; } @@ -4017,7 +3382,7 @@ section.review .review-layouter .review-info .review-detail .rating-calculate .p -webkit-box-direction: normal; -ms-flex-direction: row; flex-direction: row; - border-top: 1px solid #E8E8E8; + border-top: 1px solid #c7c7c7; } .cusomer-section .customer-section-info .pro-img { @@ -4036,8 +3401,7 @@ section.review .review-layouter .review-info .review-detail .rating-calculate .p } .cusomer-section .customer-section-info .pro-discription .title { - font-size: 16px; - color: #0031F0; + color: #0031f0; margin-top: 15px; } @@ -4055,5 +3419,5 @@ section.review .review-layouter .review-info .review-detail .rating-calculate .p } .cusomer-section .customer-section-info:last-child { - border-bottom: 1px solid #e8e8e8; + border-bottom: 1px solid #c7c7c7; } diff --git a/public/themes/default/assets/js/shop.js b/public/themes/default/assets/js/shop.js index eac787839..7c26cd63d 100644 --- a/public/themes/default/assets/js/shop.js +++ b/public/themes/default/assets/js/shop.js @@ -1460,10 +1460,10 @@ $(document).ready(function () { var flashes = this.$refs.flashes; flashMessages.forEach(function (flash) { - console.log(flash); flashes.addFlash(flash); }, this); }, + responsiveHeader: function responsiveHeader() {} } });