diff --git a/themes/aura/assets/cart.js b/themes/aura/assets/cart.js index c6b43766..36704268 100644 --- a/themes/aura/assets/cart.js +++ b/themes/aura/assets/cart.js @@ -39,15 +39,18 @@ async function fetchCoupons() { const discountText = document.querySelector('.discount-text'); const couponApplied = document.querySelector('.coupon-applied'); const totalPrice = document.querySelector('.item-total-price'); + let couponType if (totalPrice) { totalPrice.innerText = coupons.total ? `${coupons.total} ${currencyCode}` : ''; } if (coupons.coupon && coupons.discountedPrice) { - couponApplied.innerHTML = `${CART_PAGE_CONTENT.coupon}: '${coupons.coupon.code}' [${coupons.coupon.value}%] + couponType = coupons.coupon.type === 1 ? '%' : ` ${currencyCode}`; + + couponApplied.innerHTML = `${CART_PAGE_CONTENT.coupon}: '${coupons.coupon.code}' [${coupons.coupon.value}${couponType}] `; - discount.innerText = coupons.discountedPrice + ' ' + currencyCode; + discount.innerText = `- ${coupons.discountedPrice} ${currencyCode}`; const removeCouponElement = document.getElementById("remove-coupon"); if (removeCouponElement) { diff --git a/themes/harmony/assets/cart.js b/themes/harmony/assets/cart.js index f5e92d6b..52be3c19 100644 --- a/themes/harmony/assets/cart.js +++ b/themes/harmony/assets/cart.js @@ -39,15 +39,18 @@ async function fetchCoupons() { const discountText = document.querySelector('.discount-text'); const couponApplied = document.querySelector('.coupon-applied'); const totalPrice = document.querySelector('.item-total-price'); + let couponType if (totalPrice) { totalPrice.innerText = coupons.total ? `${coupons.total} ${currencyCode}` : ''; } if (coupons.coupon && coupons.discountedPrice) { - couponApplied.innerHTML = `${CART_PAGE_CONTENT.coupon}: '${coupons.coupon.code}' [${coupons.coupon.value}%] + couponType = coupons.coupon.type === 1 ? '%' : ` ${currencyCode}`; + + couponApplied.innerHTML = `${CART_PAGE_CONTENT.coupon}: '${coupons.coupon.code}' [${coupons.coupon.value}${couponType}] `; - discount.innerText = coupons.discountedPrice + ' ' + currencyCode; + discount.innerText = `- ${coupons.discountedPrice} ${currencyCode}`; const removeCouponElement = document.getElementById("remove-coupon"); if (removeCouponElement) { diff --git a/themes/meraki/assets/cart.css b/themes/meraki/assets/cart.css index 934edd3c..00820ee9 100644 --- a/themes/meraki/assets/cart.css +++ b/themes/meraki/assets/cart.css @@ -247,11 +247,8 @@ body{ font-family:inherit; border-radius:0; border-radius:initial; - border:none; width:auto; width:initial; - background-color:#F1F1F1; - color:#A4A4A4; flex-shrink:0; } .yc-cart .cart-table .summary-box #summary .coupon-wrapper .yc-btn-secondary .spinner{ @@ -267,15 +264,20 @@ body{ .yc-cart .cart-table .summary-box #summary .coupon-container{ display:flex; justify-content:space-between; - padding:15px 24px 0; + padding:0 0 15px; +} +@media (min-width: 768px){ + .yc-cart .cart-table .summary-box #summary .coupon-container{ + padding:15px 20px 0; + } } .yc-cart .cart-table .summary-box #summary .discount-text{ font-weight:700; font-size:14px; } .yc-cart .cart-table .summary-box #summary .discount-price{ - font-size:15px; - font-weight:500; + font-size:14px; + font-weight:600; } .yc-cart .cart-table .summary-box #summary .coupon-applied{ display:flex; @@ -338,7 +340,7 @@ body{ } @media (min-width: 768px){ .yc-cart .cart-table .summary-box #summary .total-price-wrapper .total-items{ - padding:15px 24px 20px 24px; + padding:15px 20px 20px; } } .yc-cart .cart-table .summary-box #summary .total-price-wrapper .total-items *{ diff --git a/themes/meraki/assets/cart.js b/themes/meraki/assets/cart.js index 0837054d..d464d34c 100644 --- a/themes/meraki/assets/cart.js +++ b/themes/meraki/assets/cart.js @@ -39,15 +39,18 @@ async function fetchCoupons() { const discountText = document.querySelector('.discount-text'); const couponApplied = document.querySelector('.coupon-applied'); const totalPrice = document.querySelector('.item-total-price'); + let couponType if (totalPrice) { totalPrice.innerText = coupons.total ? `${coupons.total} ${currencyCode}` : ''; } if (coupons.coupon && coupons.discountedPrice) { - couponApplied.innerHTML = `${CART_PAGE_CONTENT.coupon}: '${coupons.coupon.code}' [${coupons.coupon.value}%] + couponType = coupons.coupon.type === 1 ? '%' : ` ${currencyCode}`; + + couponApplied.innerHTML = `${CART_PAGE_CONTENT.coupon}: '${coupons.coupon.code}' [${coupons.coupon.value}${couponType}] `; - discount.innerText = coupons.discountedPrice + ' ' + currencyCode; + discount.innerText = `- ${coupons.discountedPrice} ${currencyCode}`; const removeCouponElement = document.getElementById("remove-coupon"); if (removeCouponElement) { diff --git a/themes/meraki/sections/main-cart.liquid b/themes/meraki/sections/main-cart.liquid index fa640f08..c0828766 100644 --- a/themes/meraki/sections/main-cart.liquid +++ b/themes/meraki/sections/main-cart.liquid @@ -27,8 +27,8 @@
{{ item.name }} -
diff --git a/themes/meraki/styles/cart.scss b/themes/meraki/styles/cart.scss index 13310607..b634e974 100644 --- a/themes/meraki/styles/cart.scss +++ b/themes/meraki/styles/cart.scss @@ -258,10 +258,7 @@ body { .yc-btn-secondary { font-family: inherit; border-radius: unset; - border: none; width: unset; - background-color: #F1F1F1; - color: #A4A4A4; flex-shrink: 0; .spinner { @@ -280,7 +277,11 @@ body { .coupon-container { display: flex; justify-content: space-between; - padding: 15px 24px 0; + padding: 0 0 15px; + + @include breakpoint('md') { + padding: 15px 20px 0; + } } .discount-text { @@ -289,8 +290,8 @@ body { } .discount-price { - font-size: 15px; - font-weight: 500; + font-size: 14px; + font-weight: 600; } .coupon-applied { @@ -361,7 +362,7 @@ body { padding: 0 0 26px 0; @include breakpoint('md') { - padding: 15px 24px 20px 24px; + padding: 15px 20px 20px; } & * {