wickes-css2 2.98.0-develop.12 → 2.98.0-develop.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wickes-css2",
-  "version": "2.98.0-develop.12",
+  "version": "2.98.0-develop.14",
   "description": "CSS and JS and page templates in use by Wickes",
   "main": "index.js",
   "scripts": {
@@ -108,7 +108,7 @@
     "branches": [
       "alt-master",
       {
-        "name": "develop",
+        "name": "custom-tag/0.5.0-icons",
         "prerelease": "${name.replace(/^custom-tag\\//g, '')}"
       }
     ],

package/src/js/components/general/offer-banner.js

@@ -1,16 +1,67 @@
 $(document).ready(function () {
   Wick.OfferBanner = (function () {
     var offerBanner = $('.offer-banner')[0],
-        offer;
+      offer;
 
-    var init = function(){
+    var selectors = [
+      'main > div > div > div:nth-child(1) > div > h1',
+      'main > div.hybris-class > div > h1:nth-child(1)',
+      'main > div.cartMessages',
+      'main div.checkout-header',
+      'main.my-account',
+      'div.new-usp-container',
+      'div.breadcrumbs'
+    ];
+
+    var targetContainers = ['main', 'div.new-usp-container', 'div.breadcrumbs'];
+
+    Wick.applyTopMarginIfBanner = function () {
+      if (!Wick.isTradePro) {
+        return;
+      }
+
+      if (!offerBanner) {
+        return;
+      }
+
+      let bannerHeight = $(offerBanner).outerHeight();
+
+      var containers = new Set();
+      var containersSelector = targetContainers.join(', ');
+
+      selectors.forEach(function (sel) {
+        var elements = $(sel);
+        if (!elements.length) return;
+
+        elements.each(function () {
+          var container = $(this).closest(containersSelector);
+          if (container.length) {
+            containers.add(container[0]);
+          }
+        });
+      });
+
+      var hasBreadcrumbs = Array.from(containers).some(el => $(el).is('div.breadcrumbs'));
+
+      if (hasBreadcrumbs) {
+        containers = new Set(
+          Array.from(containers).filter(el => $(el).is('div.breadcrumbs'))
+        );
+      }
+
+      containers.forEach(function (el) {
+        $(el).css('margin-top', bannerHeight + 'px');
+      });
+    }
+
+    var init = function () {
       offer = new Waypoint.Sticky({
         element: offerBanner
       });
     };
 
-    var toggle = function(){
-      if (offer){
+    var toggle = function () {
+      if (offer) {
         offer.destroy();
         offer = null;
       } else {
@@ -18,21 +69,19 @@ $(document).ready(function () {
       }
     };
 
-    function handleResize(){o
-      if (!offer){
+    function handleResize() {
+      if (!offer) {
         return;
       }
-
       var elHeight = offer.$element.outerHeight(true);
-      if (elHeight !== offer.$wrapper.outerHeight(true)){
+      if (elHeight !== offer.$wrapper.outerHeight(true)) {
         offer.$wrapper.height(elHeight);
       }
-    };
+    }
 
-    var bindEvents = function(){
+    var bindEvents = function () {
       $(window).on('resize', handleResize);
       $(window).on('orientationchange', handleResize);
-
       $(document).on('mobileNav.toggle', toggle);
     };
 
@@ -40,13 +89,11 @@ $(document).ready(function () {
       return;
     }
 
-    //Workaround for sticky banner functionality in IE
+    // Workaround for sticky banner functionality in IE
     function isIE() {
-      ua = navigator.userAgent;
+      var ua = navigator.userAgent;
       /* MSIE used to detect old browsers and Trident used to newer ones*/
-      var is_ie = ua.indexOf("MSIE ") > -1 || ua.indexOf("Trident/") > -1;
-
-      return is_ie;
+      return ua.indexOf("MSIE ") > -1 || ua.indexOf("Trident/") > -1;
     }
 
     if (isIE()) {
@@ -54,6 +101,8 @@ $(document).ready(function () {
       bindEvents();
     }
 
+    Wick.applyTopMarginIfBanner();
+
     return offer;
   })();
 });

package/src/js/emulation/basket-data.js

@@ -879,12 +879,12 @@ Wick.BasketData = (function () {
       "appliedProductPromotions": [],
       "appliedOrderPromotions": [],
       "promotionsInfo": null,
-      "clickAndCollectOnly": true,
+      "clickAndCollectOnly": false,
       "deliveryItemsQuantity": 1,
       "pickupItemsQuantity": 2,
-      "freeDelivery": false,
+      "freeDelivery": true,
       "subtotalWithoutCharity": {"value": 19.0, "formattedValue": "£19.00", "currencyIso": "GBP", "formattedPriceWithoutCurrencySymbol": "19.00"},
-      "messageForFreeDelivery": null,
+      "messageForFreeDelivery": "Free delivery<i class=\"icon fas fa-check\"></i>",
       "pickupOrderGroups": [
         {
           "entries": [

package/src/js/page/components/order-summary.js

@@ -80,7 +80,7 @@ function calculateFreeDelivery(data) {
                 $(this).find(osEl.summaryDelivery).before(function () {
                     return `
                         <div class="checkout-widget__item checkout-widget__item-free">
-                            <span>
+                            <span class="checkout-widget__text">
                                ${data.messageForFreeDelivery}
                             </span>
                         </div>

package/src/scss/components/_billie-modal.scss

@@ -1,4 +1,14 @@
 .modal.billie-modal {
+
+  :where(ul, ol) {
+    list-style: revert;
+  }
+
+  :where(li) {
+    display: list-item;
+    list-style: inherit;
+  }
+
   .modal-header,
   .modal-footer {
     position: sticky;

package/src/scss/components/_order-summary.scss

@@ -113,50 +113,6 @@ $ios-notch-offset: 80px !default;
     }
   }
 
-  .checkout-widget {
-    &__voucher-accordion {
-      margin-top: 10px;
-    }
-
-    &__voucher-toggle {
-      margin-bottom: 8px;
-      cursor: pointer;
-      display: flex;
-      justify-content: space-between;
-      color: $blue;
-      font-size: .875rem;
-
-      &.collapsed {
-        margin-bottom: 0;
-
-        .checkout-widget__icon {
-          transform: rotate(180deg);
-        }
-      }
-    }
-
-    &__icon {
-      width: 16px;
-      height: 16px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-
-    &__voucher-section {
-      margin-top: 1rem;
-    }
-
-    &__voucher-list {
-      list-style: none;
-      padding: 0;
-    }
-
-    &__voucher-value {
-      font-weight: bold;
-    }
-  }
-
   .summary__mobile-order.collapsed .summary__icon {
     transform: rotate(0deg);
   }
@@ -176,11 +132,14 @@ $ios-notch-offset: 80px !default;
   }
 
   .checkout-widget__item-free {
+    line-height: 1.375rem;
+
     .icon {
-      margin-left: 5px;
-      margin-bottom: -2px;
-      vertical-align: bottom;
-      color: #67a589;
+      margin-left: 8px;
+      vertical-align: middle;
+      color: $green;
+      width: 1rem;
+      height: 1rem;
     }
   }
 

package/src/scss/components/_voucher-accordion.scss

@@ -0,0 +1,56 @@
+@import '../helpers/helpers';
+
+.checkout-widget {
+  &__voucher-accordion {
+    margin-top: 10px;
+  }
+
+  &__voucher-toggle {
+    margin-bottom: 8px;
+    cursor: pointer;
+    display: flex;
+    justify-content: space-between;
+    color: $blue;
+    font-size: .875rem;
+
+    &.collapsed {
+      margin-bottom: 0;
+
+      .checkout-widget__icon {
+        transform: rotate(180deg);
+      }
+    }
+  }
+
+  &__icon {
+    width: 16px;
+    height: 16px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  &__voucher-section {
+    margin-top: 1rem;
+  }
+
+  &__voucher-list {
+    list-style: none;
+    padding: 0;
+  }
+
+  &__voucher-value {
+    font-weight: bold;
+  }
+}
+
+.collapsing {
+  height: 0;
+  overflow: hidden;
+  transition: height .3s ease-in-out;
+}
+
+.collapse.show {
+  height: auto;
+  transition: height .3s ease-in-out;
+}

package/src/scss/main.scss

@@ -88,6 +88,7 @@
 @import 'components/error-frame';
 @import 'components/cards-slider';
 @import 'components/sticky-element-appearance';
+@import 'components/voucher-accordion';
 
 // Pages
 @import 'pages/contact-us';

package/src/scss/pages/page_product-details-v2.scss

@@ -134,6 +134,15 @@
   &__main {
     padding-top: 40px;
 
+    :where(ul, ol) {
+      list-style: revert;
+    }
+
+    :where(li) {
+      display: list-item;
+      list-style: inherit;
+    }
+
     @include media-breakpoint-only(md) {
       padding-top: 35px;
     }