wickes-css2 2.105.0-develop.2 → 2.105.0-develop.4

package/src/page_search-results.html

@@ -16,8 +16,7 @@
 
     <div class="row">
       <aside class="left-aside">
-        {{> search-filter collapsed="accordion_collapsed" hidden="hidden-state" fixed-height="custom-scroll"}}
-        {{> search-filter-mobile }}
+        {{> search-filter collapsed="accordion_collapsed" hidden="hidden-state"}}
       </aside>
 
       <div class="content">
@@ -25,11 +24,6 @@
 
         <div class="sort-products-list">
           <div class="sort-products-list__section sort-products-list__items-per-page">
-            <button class="btn btn-primary open-filters-btn" id="open-overlay">
-              <span class="btn__text">
-                <span class="icon"><span class="fas fa-filter"></span></span>Show filters
-              </span>
-            </button>
             {{> form-row dropdown="true" ddn-mod="ddn_small" id="d1-top" label="Products per page" label-hidden="true" placeholder="All products per page"}}
           </div>
           <div class="sort-products-list__section sort-products-list__pagination">
@@ -80,5 +74,6 @@
 <script defer src="./js/energy-efficiency.min.js"></script>
 <script defer src="./js/page/plp-img-v2.js"></script>
 <script defer src="./js/page/plp-cards-v2.js"></script>
+<script defer src="./js/search-filter.min.js"></script>
 {{/content}}
 {{/extend}}

package/src/page_shared-project-list-bicester-hub.html

@@ -11,5 +11,6 @@
 {{#content "foot" mode="append"}}
 <script src="./js/project-list-note.min.js"></script>
 <script defer src="./js/global-search.min.js"></script>
+<script defer src="./js/saving-shopping-list.min.js"></script>
 {{/content}}
 {{/extend}}

package/src/scss/common/_common.scss

@@ -180,7 +180,7 @@ main {
   &__text {
     display: inline-block;
     vertical-align: top;
-    font-size: .875rem;
+    font-size: 0.875rem;
   }
 }
 
@@ -207,7 +207,7 @@ main {
   display: inline-block;
   padding: 2px 10px;
   background-color: $gray-bg;
-  font-size: .875rem;
+  font-size: 0.875rem;
   line-height: 1.375rem;
   border-left: 2px solid $gray;
 
@@ -318,7 +318,7 @@ main {
   border-top: 3px solid $blue-dark;
   width: 60px;
   height: 60px;
-  animation: spin .75s linear infinite;
+  animation: spin 0.75s linear infinite;
   position: absolute;
   left: calc(50% - 30px);
   top: calc(50% - 30px);
@@ -410,7 +410,8 @@ main {
 }
 
 @include media-breakpoint-down(xs) {
-  a, p {
+  a,
+  p {
     word-wrap: break-word;
   }
 

package/src/scss/components/_accordion.scss

@@ -46,7 +46,6 @@
         border-radius: 3px;
         word-wrap: break-word;
 
-
         &-icon {
           position: static;
           color: $warm-grey;
@@ -72,7 +71,6 @@
             content: '+';
             font-size: 1.77rem;
           }
-
         }
 
         &:hover {
@@ -89,7 +87,7 @@
         border-radius: 3px;
 
         &-inner {
-          font-size: .875rem;
+          font-size: 0.875rem;
           font-weight: 500;
           line-height: 18px;
         }

package/src/scss/components/_custom-slider.scss

@@ -6,8 +6,9 @@
   border-radius: 0;
   position: fixed;
   background-color: $white;
-  box-shadow: 0 4px 8px rgba(0, 0, 0, .2);
-  transition: transform .4s ease, opacity .4s ease;
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+  /* prettier-ignore */
+  transition: transform 0.4s ease, opacity 0.4s ease;
   opacity: 0;
   display: flex;
   flex-direction: column;
@@ -130,7 +131,7 @@
 
       &__notice {
         margin-top: 4px;
-        font-size: .75rem;
+        font-size: 0.75rem;
         font-weight: 400;
         line-height: 1rem;
         color: $squant;
@@ -206,7 +207,7 @@
       }
 
       .title {
-        font-size: .875rem;
+        font-size: 0.875rem;
         font-weight: 500;
         line-height: 1.375rem;
         text-decoration: none;
@@ -214,7 +215,7 @@
       }
 
       .item {
-        font-size: .75rem;
+        font-size: 0.75rem;
         font-weight: 400;
         line-height: 1rem;
         color: $squant;
@@ -290,8 +291,8 @@
         }
 
         &[disabled] {
-          border: 0;
-          opacity: .6;
+          border: none;
+          opacity: 0.6;
         }
       }
     }
@@ -299,7 +300,7 @@
     .btn--remove,
     .btn--quantity {
       &:hover {
-        opacity: .7;
+        opacity: 0.7;
       }
     }
 
@@ -332,10 +333,10 @@
     grid-gap: 16px;
     padding: 16px;
     background: $white;
-    transition: all .3s ease;
+    transition: all 0.3s ease;
 
     &.footer-fixed {
-      box-shadow: 0 -4px 12px 0 rgba(0, 0, 0, .08);
+      box-shadow: 0px -4px 12px 0px rgba(0, 0, 0, 0.08);
       position: fixed;
       width: 100%;
       left: 0;
@@ -406,7 +407,7 @@
     }
 
     .custom-slider__footer {
-      box-shadow: 0 -4px 12px 0 rgba(0, 0, 0, .08);
+      box-shadow: 0px -4px 12px 0px rgba(0, 0, 0, 0.08);
       flex-direction: column;
     }
   }
@@ -519,7 +520,7 @@
 
           .checkout-widget__details-hidden {
             padding-left: 15px;
-            font-size: .75rem;
+            font-size: 0.75rem;
             line-height: 1rem;
             list-style-type: disc;
             font-weight: 400;
@@ -530,7 +531,7 @@
             .icon {
               color: $blue;
               font-size: 1rem;
-              transition: all .3s ease;
+              transition: all 0.3s ease;
               transform: rotate(180deg);
             }
 
@@ -599,7 +600,7 @@
       margin-top: 12px;
 
       &__details .title {
-        @include multiline-ellipsis();
+        @include multiline-ellipsis(1);
       }
 
       &__item {

package/src/scss/components/_date-selection-add-new-styles.scss

@@ -17,7 +17,7 @@
   }
 
   &__annotation {
-    font-size: .75rem;
+    font-size: 0.75rem;
   }
 
   .delivery-date::after {
@@ -70,14 +70,14 @@
       &_names {
         background: $white;
         color: $blue-ocean-dark;
-        font-size: .875rem;
+        font-size: 0.875rem;
         font-weight: 500;
         margin: 0;
       }
 
       &_days {
-        font-size: .8125rem;
-        line-height: .8125rem;
+        font-size: 0.8125rem;
+        line-height: 0.8125rem;
         font-weight: 500;
       }
 
@@ -88,7 +88,7 @@
 
     &__cell {
       &_cnt {
-        font-size: .875rem;
+        font-size: 0.875rem;
         border-radius: 50%;
         height: 34px;
         line-height: 34px;
@@ -111,7 +111,6 @@
         }
       }
 
-
       &_selected,
       &:active {
         position: relative;
@@ -225,7 +224,7 @@
 
     .subtitle {
       margin-top: 2px;
-      font-size: .875rem;
+      font-size: 0.875rem;
       font-weight: 400;
       line-height: 22px;
       text-wrap: auto;

package/src/scss/components/_date-selection.scss

@@ -404,7 +404,7 @@
       right: 20px;
       font-size: 1.125rem;
       color: $blue;
-      transition: all .5s ease;
+      transition: all 0.5s ease;
       transform: rotate(180deg);
     }
   }

package/src/scss/components/{kitchen/_filter-modal.scss → _filter-modal.scss}

@@ -1,4 +1,6 @@
 .filter-modal {
+  border-radius: 0;
+
   &__title {
     font-size: 1.125rem;
     font-style: normal;
@@ -14,18 +16,27 @@
     z-index: 10;
     box-shadow: none;
     border-bottom: 0;
-    transition: box-shadow .3s ease;
+    transition: box-shadow 0.3s ease;
     padding: 0;
   }
 
+  .modal-box__row,
+  .modal-box__columns,
+  .modal-dialog,
+  .modal-box__content {
+    height: 100%;
+  }
+
   .modal-dialog {
     width: 100%;
     max-width: 100%;
+    height: 100%;
     margin: 0;
   }
 
   .modal-content {
     width: 100%;
+    border-radius: 0;
   }
 
   .modal-box__content {
@@ -57,7 +68,6 @@
     width: 100%;
   }
 
-
   .modal-footer {
     justify-content: center;
     bottom: 0;
@@ -89,6 +99,17 @@
     right: 16px;
     top: 20px;
     opacity: 1;
+    font-weight: 700;
+    line-height: 1;
+    font-size: 1rem;
+    color: $warm-grey;
+    background-color: transparent;
+    border: 0;
+    -webkit-appearance: none;
+    position: absolute;
+    padding: 0;
+    margin: 0;
+    cursor: pointer;
   }
 
   .modal-footer {
@@ -136,7 +157,7 @@
     &[data-scroll-state='middle'],
     &[data-scroll-state='bottom'] {
       .modal-header {
-        box-shadow: 0 0 15px rgba(0, 0, 0, .2);
+        box-shadow: 0 0 15px rgba(0, 0, 0, 0.2);
         border-bottom: 0;
       }
     }
@@ -144,7 +165,37 @@
     &[data-scroll-state='middle'],
     &[data-scroll-state='top'] {
       .modal-footer {
-        box-shadow: 0 -2px 4px rgba(0, 0, 0, .05);
+        box-shadow: 0 -2px 4px rgba(0, 0, 0, 0.05);
+      }
+    }
+  }
+}
+
+.products-list-page {
+  .filter-modal {
+    .modal-header {
+      .modal-box__inner-row {
+        .modal-box__inner-columns {
+          padding: 20px 16px 14px;
+        }
+      }
+    }
+  }
+
+  .filter-modal {
+    .modal-box__inner-columns {
+      margin: 0;
+
+      .accordion {
+        position: relative;
+        padding-top: 20px;
+        padding-bottom: 20px;
+
+        &:first-of-type {
+          &:before {
+            border-top: 0;
+          }
+        }
       }
     }
   }

package/src/scss/components/{kitchen/_plp-filters.scss → _plp-filters.scss}

@@ -1,8 +1,14 @@
+.products-list-page {
+  .plp-filters {
+    margin-left: -15px;
+    margin-right: -15px;
+  }
+}
+
 .plp-filters {
-  width: 100%;
   position: sticky;
   top: 0;
-  z-index: $popover;
+  z-index: $popover-under;
 
   &__bar {
     &-mobile {
@@ -10,13 +16,13 @@
       border-top: 1px solid $gray;
       border-bottom: 1px solid $gray;
       background: $white;
-      transition: all .1s ease;
+      transition: all 0.1s ease;
     }
 
     &-stuck {
       border-top: 0;
       border-bottom: 0;
-      box-shadow: 0 0 15px rgba(0, 0, 0, .2);
+      box-shadow: 0 0 15px rgba(0, 0, 0, 0.2);
     }
 
     .mobile-nav {
@@ -24,14 +30,26 @@
         @include make-col(6);
         position: relative;
         display: flex;
-        padding: 9px 12px 9px 17px;
+        padding: 9px 12px 9px 18px;
         align-items: center;
 
         &:first-of-type {
+          padding: 9px 12px 9px 20px;
+
+          .mobile-nav {
+            &__content {
+              padding-left: 12px;
+            }
+
+            &__icon {
+              font-size: 1rem;
+            }
+          }
+
           &:after {
             content: '';
             position: absolute;
-            right: 0;
+            right: -1px;
             top: 8px;
             height: calc(100% - 16px);
             border-right: 1px solid $gray;
@@ -47,20 +65,20 @@
       &__icon {
         display: flex;
         align-items: center;
-        font-size: 1.167rem;
+        font-size: 1.125rem;
         color: $blue-ocean-dark;
-        transform: translateY(.5px);
+        transform: translateY(0.5px);
       }
 
       &__title {
-        font-size: .875rem;
+        font-size: 0.875rem;
         font-weight: $headings-font-weight;
         line-height: 1.375rem;
         color: $blue-dark;
       }
 
       &__info {
-        font-size: .75rem;
+        font-size: 0.75rem;
         font-weight: $font-weight-normal;
         line-height: 1rem;
         color: $squant;
@@ -146,8 +164,8 @@
   }
 
   &__chevron {
-    font-size: .858rem;
-    transition: transform .2s ease;
+    font-size: 0.858rem;
+    transition: transform 0.2s ease;
     transform-origin: 50% 50%;
     margin-right: 8px;
   }
@@ -200,7 +218,7 @@
     display: block;
     min-width: 16px;
     height: 16px;
-    font-size: .75rem;
+    font-size: 0.75rem;
     margin-left: 4px;
 
     span {

package/src/scss/components/_popover-mini-basket.scss

@@ -34,7 +34,7 @@
     &-desc {
       display: inline-block;
       margin-top: 4px;
-      font-size: .75rem;
+      font-size: 0.75rem;
     }
 
     &-text-wrapper {
@@ -44,7 +44,7 @@
     &-message {
       margin: 0;
       display: inline-block;
-      font-size: .875rem;
+      font-size: 0.875rem;
       vertical-align: middle;
       font-weight: 500;
       max-width: calc(100% - 30px);
@@ -119,7 +119,7 @@
     .notification__close {
       right: 10px;
       top: 10px;
-      font-size: .75rem;
+      font-size: 0.75rem;
     }
 
     .notification__icon {

package/src/scss/components/_search-filter.scss

@@ -3,6 +3,25 @@
     padding: 20px 0 0;
   }
 
+  &__facet-cta {
+    background: transparent;
+    border: 0;
+    padding: 0;
+    cursor: pointer;
+    color: $blue;
+    font-weight: 500;
+    font-size: 0.875rem;
+    line-height: 22px;
+
+    &:focus {
+      outline: none;
+    }
+
+    &:focus-visible {
+      outline: auto;
+    }
+  }
+
   &__item {
     margin-bottom: 20px;
 
@@ -23,19 +42,44 @@
 }
 
 .filter-results {
+  .accordions {
+    overflow: auto;
+    max-height: calc(100vh - 137px);
+  }
+
   &_mobile {
-    max-height: 100vh;
     overflow-y: auto;
     -webkit-overflow-scrolling: touch;
   }
 
+  &_desktop {
+    position: sticky;
+  }
+
   &__heading {
-    padding: 10px 0;
+    padding: 12px 0;
+    position: sticky;
+    background-color: $white;
+    z-index: $filters;
+
+    &:before {
+      content: '';
+      bottom: 100%;
+      left: 0;
+      position: absolute;
+      width: 100%;
+      height: 40px;
+      background: $white;
+    }
 
     .link-secondary {
       text-decoration: none;
       float: right;
     }
+
+    .flex {
+      margin-bottom: 8px;
+    }
   }
 
   &__actions {
@@ -56,16 +100,6 @@
     }
   }
 
-  &__close-holder {
-    margin-bottom: 10px;
-    text-align: right;
-  }
-
-  &__btn-close {
-    color: $warm-grey;
-    font-size: 1rem;
-  }
-
   .custom-scroll {
     &[data-simplebar] {
       max-height: 234px;
@@ -83,8 +117,25 @@
   }
 
   .filter-results {
-    padding: 20px 15px;
+    &_desktop {
+      display: none;
+    }
+
+    &__heading {
+      padding-bottom: 20px;
+    }
+  }
+}
+
+.page-responsiveThematicProductListPage {
+  .sort-products-list {
+    @include make-row;
+    justify-content: space-between;
+  }
+
+  .filter-results_mobile {
     display: none;
+    padding: 20px 15px;
     position: fixed;
     top: 0;
     right: 0;
@@ -98,8 +149,24 @@
       display: block;
     }
 
-    &__heading {
-      padding-bottom: 20px;
+    &__close-holder {
+      display: block;
+    }
+
+    .filter-results {
+      &__heading:before {
+        display: none;
+      }
+
+      &__close-holder {
+        margin-bottom: 10px;
+        text-align: right;
+      }
+
+      &__btn-close {
+        color: $warm-grey;
+        font-size: 1rem;
+      }
     }
   }
 }
@@ -116,4 +183,17 @@
       display: none;
     }
   }
+
+  .page-responsiveThematicProductListPage {
+    .filter-results {
+      &_desktop {
+        display: block;
+        position: static;
+      }
+
+      &__heading {
+        position: static;
+      }
+    }
+  }
 }

package/src/scss/components/_shared-shopping-list.scss

@@ -93,6 +93,28 @@
       }
     }
   }
+
+  .ios-custom-share-icon {
+    margin-right: 13px;
+
+    path {
+      transition: fill 0.2s ease;
+    }
+  }
+
+  .btn-secondary:hover,
+  .btn-secondary:active,
+  .btn-secondary:focus {
+    .ios-custom-share-icon path {
+      fill: $white !important;
+    }
+  }
+}
+
+.tp-app {
+  .btn-back-to-project-list {
+    display: none !important;
+  }
 }
 
 .copy-link_hovered {