wickes-css2 2.111.0-develop.1 → 2.111.0-develop.2

package/src/page_instore_progress_bar.html

@@ -20,6 +20,10 @@
       {{> checkout_click-and-collect }}
   {{/content}}
   {{#content "foot" mode="append"}}
+{{> checkout-voucher-remove-modal
+    shopping-cart-v2.checkout.voucher-remove-popup
+    id="voucher-remove-popup"
+}}
     <script defer src="./js/page/checkout-payment-details.js"></script>
     {{> checkout-terms-and-conditions-modal }}
   {{/content}}

package/src/page_product-details-with-global-search-v2.html

@@ -18,6 +18,7 @@ switch-vat=true
 <link type="text/css" rel="stylesheet" href="./css/components/global-search.css">
 {{/content}}
 {{#content "body"}}
+{{>tradepro-discount-banner}}
 <main class="pdp__main">
   <div class="container">
     <div class="pdp">

package/src/page_shopping-cart-registered-v2.html

@@ -49,6 +49,10 @@
   {{> checkout-action}}
 {{/content}}
 {{#content "foot" mode="append"}}
+  {{> checkout-voucher-remove-modal
+      shopping-cart-v2.checkout.voucher-remove-popup
+      id="voucher-remove-popup"
+  }}
   <script src="./js/basket.min.js"></script>
 {{/content}}
 {{/extend}}

package/src/page_shopping-cart-v2-vat.html

@@ -53,4 +53,10 @@
   }}
   {{> checkout-action mod="checkout-action-payways"}}
 {{/content}}
+{{#content "foot" mode="append"}}
+  {{> checkout-voucher-remove-modal
+      shopping-cart-v2.checkout.voucher-remove-popup
+      id="voucher-remove-popup"
+  }}
+{{/content}}
 {{/extend}}

package/src/page_shopping-cart-v2.html

@@ -1,4 +1,4 @@
-{{#extend "basket-new" page_shopping-cart pageClass="page_basket basket" title="Basket" billieIcon=false}}
+{{#extend "basket-new" page_shopping-cart pageClass="page_basket basket" title="Basket" billieIcon=false bundle="basket"}}
   {{#content "head" mode="append"}}
     <link type="text/css" rel="stylesheet" href="./css/pages/page_shopping-cart-v2.css">
     <link type="text/css" rel="stylesheet" href="./css/pages/checkout-new.css">
@@ -44,6 +44,9 @@
 {{> basket-charity-donations-new   shopping-cart-v2.charityDonationNew }}
 {{/content}}
 {{#content "foot" mode="append"}}
-  <script defer src="./js/basket.min.js"></script>
+  {{> checkout-voucher-remove-modal
+      shopping-cart-v2.checkout.voucher-remove-popup
+      id="voucher-remove-popup"
+  }}
 {{/content}}
 {{/extend}}

package/src/page_shopping-cart-v3-instore.html

@@ -56,6 +56,10 @@ basket=true
 {{> checkout-action}}
 {{/content}}
 {{#content "foot" mode="append"}}
+{{> checkout-voucher-remove-modal
+    shopping-cart-v2.checkout.voucher-remove-popup
+    id="voucher-remove-popup"
+}}
 <script defer src="./js/global-search.min.js"></script>
 <script defer src="./js/basket.min.js"></script>
 <script defer src="./js/add-project-list-id.min.js"></script>

package/src/scss/components/_checkout-voucher-remove-modal.scss

@@ -0,0 +1,108 @@
+.voucher-remove-modal {
+  .modal-dialog {
+    margin-top: 40px;
+  }
+
+  .modal-box__header {
+    &::after {
+      left: 0;
+      right: 0;
+    }
+  }
+
+  .modal-box__footer {
+    display: none;
+  }
+
+  .modal-box__content {
+    border-radius: 0.3rem;
+  }
+
+  &__coupon-name {
+    font-weight: 500;
+  }
+
+  .modal-box__columns {
+    flex: 1;
+    max-width: 500px;
+  }
+
+  .modal-box__inner-columns {
+    flex: 1;
+    max-width: 100%;
+  }
+
+  .modal-header {
+    padding: 16px;
+
+    .modal-box__inner-columns {
+      display: flex;
+      align-items: center;
+
+      .info-icon {
+        @include font-size(27);
+        color: $orange;
+      }
+    }
+
+    .close {
+      position: absolute;
+      top: 8px;
+      right: 8px;
+      margin: 0;
+      padding: 0;
+
+      .icon svg {
+        @include font-size(16);
+      }
+    }
+
+    .modal-title {
+      @include font-size(18);
+      @include line-height(24);
+      margin-left: 15px;
+      font-weight: 500;
+    }
+  }
+
+  .modal-body {
+    padding: 16px;
+
+    .description {
+      @include font-size(16);
+      @include line-height(24);
+      margin-bottom: 0;
+      font-weight: 400;
+
+      .new-email {
+        font-weight: 700;
+      }
+    }
+  }
+
+  &__actions {
+    display: flex;
+    grid-gap: 16px;
+    margin-top: 32px;
+  }
+}
+
+@include media-breakpoint-up(sm) {
+  .voucher-remove-modal {
+    .modal-header {
+      padding: 16px 24px;
+    }
+
+    .modal-body {
+      padding: 24px 24px 16px;
+    }
+
+    &__actions {
+      margin-top: 40px;
+
+      .btn_full {
+        width: auto;
+      }
+    }
+  }
+}

package/src/scss/components/_tradepro-discount-banner.scss

@@ -0,0 +1,78 @@
+.tradepro-discount-banner {
+  position: relative;
+  z-index: $offer-banner;
+  width: 100%;
+  background-color: $blue;
+  color: $white;
+
+  &.stuck {
+    position: fixed;
+    top: 0;
+    z-index: $offer-banner-stuck;
+  }
+
+  &__content {
+    display: block;
+    padding: 4px 25px;
+    text-align: center;
+    color: $white;
+    text-decoration: none;
+
+    &:hover {
+      color: $white;
+      text-decoration: none;
+    }
+
+    strong {
+      font-weight: 500;
+    }
+  }
+
+  &__link {
+    white-space: nowrap;
+    color: $white;
+    text-decoration: none;
+
+    &:hover {
+      color: $white;
+      text-decoration: underline;
+    }
+
+    &:not(a) {
+      &:hover {
+        text-decoration: none;
+      }
+    }
+
+    &-arrow {
+      margin-left: 10px;
+    }
+  }
+
+  & .notification__close {
+    right: 4px;
+    top: 4px;
+  }
+}
+
+.global-search {
+  .tradepro-discount-banner {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+  }
+
+}
+
+@media screen and (max-width: 370px) {
+  .tradepro-discount-banner {
+    &__content {
+      padding: 4px 20px 4px 10px;
+    }
+
+    &__link-text {
+      font-size: 12px;
+    }
+  }
+}

package/src/scss/components/global-search.scss

@@ -139,6 +139,12 @@
   padding: 0;
   min-height: 150px;
 
+  @include media-breakpoint-down(sm) {
+    &--has-tradepro-banner {
+      padding-top: 30px;
+    }
+  }
+
   a {
     color: $gray-dark;
     text-decoration: none;
@@ -412,6 +418,11 @@
     box-shadow: 0 1px 5px rgba(0, 0, 0, .12), 0 2px 2px rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2);
     padding: 15px;
 
+    &--has-tradepro-banner {
+      padding-top: 45px;
+      overflow: hidden;
+    }
+
     &__body {
       height: auto;
       border-radius: 10px;

package/src/scss/globals/_global-components.scss

@@ -1,6 +1,7 @@
 @import '../components/product-card-preview';
 @import '../components/cookies-policy';
 @import '../components/offer-banner';
+@import '../components/tradepro-discount-banner';
 @import '../components/back-to-top';
 @import '../components/payments';
 @import '../components/popover-mini-basket';

package/src/scss/main.scss

@@ -20,6 +20,7 @@
 @import 'components/account-heading'; //deep dependence
 @import 'components/card-store-locator'; //deep dependence
 @import 'components/offer-banner'; //deep dependence
+@import 'components/tradepro-discount-banner';
 @import 'components/pagination'; //deep dependence
 @import 'components/price-block'; //deep dependence
 @import 'components/back-to-top'; //deep dependence
@@ -92,6 +93,7 @@
 @import 'components/voucher-accordion';
 @import 'components/checkout-chip';
 @import 'components/checkout-payment-repayment-terms';
+@import 'components/checkout-voucher-remove-modal';
 
 // Pages
 @import 'pages/contact-us';