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

package/src/page_store-locator-list.html

@@ -3,23 +3,22 @@
 
 {{#content "body"}}
 <main class="container">
-  <h1>Store Locator</h1>
-
-  <button class="btn btn-primary btn_store-near-me">
-    <span class="btn__text">Find a store near me</span>
-  </button>
+  <div class="store-locator-wrapper">
+    <div class="store-locator__content">
+      <h1>Store Locator</h1>
+      {{> find-a-store data-action="scroll-to-list"}}
+    </div>
 
-  <div class="row-holder">
-    <div class="map-container">
-      <div class="map store-locator-popup__map">
-        {{> google-map}}
+    <div class="row-holder">
+      <div class="map-container">
+        <div class="map store-locator-popup__map">
+          <div class="map__google-map" id="map" style="background: url('https://placehold.co/1200x700?text=Map') no-repeat center/cover"></div>
+        </div>
       </div>
     </div>
   </div>
 
-  {{> find-a-store data-action="scroll-to-list"}}
-
-  <div class="cards-store-holder">
+  <div class="cards-store-holder" id="stores-list">
     <div class="cards-store-wrapper">
       <div class="row" id="store-cards">
         {{#each locators}}
@@ -42,4 +41,5 @@
 </main>
 {{/content}}
 {{/extend}}
-<script defer src="./js/store-locator-cards.min.js"></script>
+<script defer src="./js/store-locator.min.js"></script>
+<script defer src="./js/store-locator-cards.min.js"></script>

package/src/page_store-locator.html

@@ -2,18 +2,21 @@
   {{#content "head" mode="append" pageStoreLocator="true"}}{{/content}}
   {{#content "body"}}
     <main class="container">
-      <h1>Store Locator</h1>
-      <button class="btn btn-primary btn_store-near-me">
-        <span class="btn__text">Find a store near me</span>
-      </button>
-      <div class="row-holder">
-        <div class="map-container">
-          <div class="map store-locator-popup__map">
-            {{> google-map}}
+      <div class="store-locator-wrapper">
+        <div class="store-locator__content">
+          <h1>Store Locator</h1>
+          {{> find-a-store data-action = "./page_store-locator-list.html?searched=true#stores-list"}}
+        </div>
+
+        <div class="row-holder">
+          <div class="map-container">
+            <div class="map store-locator-popup__map">
+              <div class="map__google-map" id="map" style="background: url('https://placehold.co/1200x700?text=Map') no-repeat center/cover"></div>
+            </div>
           </div>
         </div>
       </div>
-      {{> find-a-store data-action = "./page_store-locator-list.html#stores-list"}}
     </main>
   {{/content}}
 {{/extend}}
+<script defer src="./js/store-locator.min.js"></script>

package/src/scss/components/_account-heading.scss

@@ -53,7 +53,7 @@
     @include media-breakpoint-up(md) {
       @include make-col-ready;
       display: flex;
-      align-items: end;
+      align-items: flex-end;
       justify-content: flex-end;
     }
 

package/src/scss/components/_find-a-store.scss

@@ -1,22 +1,111 @@
 .locator {
   &__header-wrapper {
-    padding-bottom: 40px;
+    padding-bottom: 24px;
 
     h2 {
-      margin-bottom: 20px;
+      margin-bottom: 16px;
+      font-size: 1.125rem;
+      font-weight: $headings-font-weight;
+      line-height: 24px;
+      text-align: left;
     }
 
     p {
       margin-bottom: 0;
       font-size: 1rem;
-      line-height: 1.5rem;
-      text-align: center;
+      line-height: 20px;
+      text-align: left;
     }
   }
+
+  &__form-wrapper {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+  }
+
+  &__near-me,
+  &__open-search {
+    border: 0;
+    background: transparent;
+    color: $blue;
+    cursor: pointer;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    padding: 0;
+    font-size: 0.875rem;
+    font-weight: $btn-font-weight;
+    line-height: 22px;
+    text-align: center;
+
+    &:hover {
+      color: $blue-dark;
+    }
+  }
+
+  &__near-me {
+    align-self: flex-start;
+  }
+
+  &__near-me-icon,
+  &__open-search-icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 24px;
+    height: 24px;
+    font-size: 1rem;
+  }
+
+  &__divider {
+    width: 100%;
+    height: 1px;
+    background-color: $gray-border;
+  }
+
+  &__select-store {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    align-items: stretch;
+    width: 100%;
+  }
+
+  .form-row,
+  &__select-row {
+    padding: 0;
+    margin-bottom: 0;
+  }
+
+  &__details-button {
+    height: 40px;
+    padding-right: 16px;
+    padding-left: 16px;
+    font-size: 0.875rem;
+    font-weight: $btn-font-weight;
+    line-height: 22px;
+    width: 100%;
+    margin-top: 0;
+  }
+
+
+  &__open-search {
+    display: none;
+    width: 100%;
+    min-height: 72px;
+    background-color: $gray-bg;
+    padding: 24px 40px;
+  }
 }
 
 .form-locator-wrapper {
-  // No asterisk for required fields on this page
+  margin-left: -15px;
+  margin-right: -15px;
+  padding: 24px;
+  background-color: $gray-bg;
+
   .form-row__label_required::before {
     content: none;
   }
@@ -25,85 +114,200 @@
 .forms-locator {
   @include make-col(12);
 
+  display: flex;
+  flex-direction: column;
+  padding: 0;
+  margin: 0 auto;
+
+  .form-locator-list,
+  .form-locator {
+    margin: 0;
+  }
+
+  .form-row {
+    margin-bottom: 0;
+  }
+
   .form-row__label,
   .form-row__field,
   .form-row__error {
     @include make-col-ready;
+    @include make-col(12);
+    @include make-col-offset(0);
   }
 
-  // TODO: delete after adding that control to the elemetns component
-  .header-search__submit {
-    right: 30px;
+  .form-row__label {
+    padding-bottom: 8px;
+    margin-bottom: 0;
+    font-size: 1rem;
+    font-weight: $btn-font-weight;
+    line-height: 24px;
   }
 
-  // ie11, edge remove default clear button
-  // sass-lint:disable no-vendor-prefixes
-  .form-locator__search-inp::-ms-clear {
-    display: none;
-  }
-}
+  .form-row__field {
+    input,
+    select {
+      height: 40px;
+      font-size: 1rem;
+      line-height: 24px;
+    }
 
-@include media-breakpoint-down(sm) {
-  .locator {
-    &__header-wrapper {
-      padding-bottom: 20px;
+    .header-search__submit {
+      right: 31px;
+      color: $blue;
+      font-size: 0.875rem;
+      font-weight: $btn-font-weight;
+      line-height: 22px;
+      padding: 0;
+
+      &-label {
+        padding-left: 12px;
+      }
 
-      p {
-        text-align: left;
-        font-size: inherit;
+      &-icon {
+        font-size: 1rem;
       }
     }
   }
 
-  .forms-locator {
-    padding-top: 20px;
+  .form-row_validation-error {
+    .form-row__field {
+      input,
+      select {
+        border-color: $red;
+      }
+    }
 
-    .form-row__label,
-    .form-row__field,
     .form-row__error {
-      @include make-col(12);
-      @include make-col-offset(0);
+      color: $red;
+      font-size: 0.75rem;
+      line-height: 20px;
     }
+  }
+}
 
-    .form-row__col-btn {
-      @include make-col(12);
-      padding: 0;
+.store-locator_geo-off {
+  .locator__select-store {
+    flex-direction: column;
+  }
+}
 
-      &:first-child {
-        @include make-col-offset(0);
+@include media-breakpoint-up(sm) {
+  .forms-locator {
+    .form-row__field {
+      .header-search__submit {
+        &-label {
+          display: initial !important;
+        }
       }
     }
   }
+
+  .form-locator-wrapper {
+    margin: 0;
+  }
+
+  .store-locator_geo-on,
+  .store-locator_geo-off {
+    .locator__select-store {
+      flex-direction: row;
+    }
+  }
+
+  .locator__details-button {
+    width: auto;
+    margin-top: 32px;
+  }
 }
+
 @include media-breakpoint-up(md) {
+  .store-locator .container {
+    padding-bottom: 72px;
+  }
+
   .forms-locator {
-    .form-row__label,
-    .form-row__field,
-    .form-row__error {
-      @include make-col(10);
-      @include make-col-offset(1);
-    }
+    max-width: 435px;
+  }
+
+  .form-locator-wrapper {
+    padding: 40px;
+  }
 
-    .form-row__col-btn {
-      @include make-col(6);
+  .locator {
+    &__select-row {
+      flex-grow: 1;
     }
   }
+
+  .forms-locator {
+    max-width: none;
+  }
 }
 
 @include media-breakpoint-up(lg) {
+  .store-locator_geo-on {
+    .locator__select-store {
+      flex-direction: column;
+    }
+  }
+
+  .locator__select-row {
+    flex-grow: initial;
+  }
+
   .forms-locator {
-    .form-row__label,
-    .form-row__field,
-    .form-row__error {
-      @include make-col(6);
-      @include make-col-offset(3);
+    max-width: 435px;
+  }
+
+  .locator {
+    &__select-row {
+      flex: 1 1 auto;
+      min-width: 212px;
+    }
+
+    &__header-wrapper p {
+      max-width: none;
+    }
+
+    &__details-button {
+      width: 100%;
+      margin-top: 0;
+    }
+  }
+
+  .store-locator_geo-off {
+    .forms-locator {
+      max-width: 435px;
+    }
+
+    .locator__details-button {
+      width: auto;
+      margin-top: 32px;
+    }
+
+    .form_invalid {
+      margin-bottom: 24px;
     }
   }
 }
 
-@include media-breakpoint-down(xs) {
-  .form-locator-wrapper {
-    margin-left: -15px;
-    margin-right: -15px;
+@include media-breakpoint-up(xl) {
+  .locator {
+    &__select-store {
+      flex-direction: row;
+    }
+  }
+
+  .store-locator_geo-on {
+    .locator__select-store {
+      flex-direction: row;
+    }
+  }
+
+  .locator {
+    &__details-button {
+      width: auto;
+      margin-top: 32px;
+    }
   }
 }

package/src/scss/components/_map.scss

@@ -173,18 +173,30 @@
       max-height: 130px !important;
       min-height: 0 !important;
       margin-right: 30px;
+      overflow: hidden !important;
 
-      div div:nth-of-type(2) {
+      > div > div:nth-of-type(2) {
+        display: flow-root;
+        width: max-content;
+        max-width: 100%;
         min-height: 0 !important;
+
+        > div:first-of-type {
+          width: 49% !important;
+          box-sizing: border-box;
+        }
       }
     }
 
     &.gm-style-iw-c {
       min-height: 0 !important;
+      min-width: 310px !important;
+      max-width: 320px !important;
     }
   }
 
-  &-ui-hover-effect {
+  &-ui-hover-effect,
+  button {
     position: absolute !important;
     top: 0;
     right: 0;
@@ -197,4 +209,19 @@
       outline: 5px auto #005fcc !important;
     }
   }
-}
+}
+
+@media screen and (max-width: 375px) {
+  .gm {
+    &-style-iw {
+      &-d > div > div:nth-of-type(2) {
+        min-width: 255px !important;
+      }
+    }
+
+    &.gm-style-iw-c {
+      min-width: 287px !important;
+      max-width: 220px !important;
+    }
+  }
+}

package/src/scss/components/_shop-colour.scss

@@ -77,7 +77,7 @@
     }
 
     &__wrapper {
-      justify-content: end;
+      justify-content: flex-end;
     }
   }
 }

package/src/scss/pages/page_product_search.scss

@@ -312,6 +312,16 @@
       padding-left: 5px;
       padding-right: 5px;
       position: relative;
+
+      &:nth-of-type(1)::before,
+      &:nth-of-type(2)::before {
+        content: '';
+        position: absolute;
+        top: -20px;
+        left: 5px;
+        width: calc(100% - 10px);
+        border-bottom: 1px solid $gray;
+      }
     }
   }
 }
@@ -334,7 +344,7 @@
   .sort-products-list {
     &__section {
       @include make-col(6);
-      color: #000000;
+      color: $black;
       border: 0;
 
       > .form-row {

package/src/scss/pages/page_store-locator-details.scss

@@ -6,7 +6,7 @@
 @import '../components/store-locator-lookup';
 
 h1 {
-  margin-bottom: 30px;
+  margin-bottom: 24px;
 }
 
 .store-locator {