Merge pull request #33 from aleevas/DS-928

[DS-928][DS-929][DS-930][DS-931][DS-932] Fixes after QA phase

openy_home_branch/modules/ws_home_branch/assets/scss/ws-header-selector.scss

@@ -18,6 +18,10 @@
     font-weight: 400;
     text-transform: none !important;
   }
+
+    .mobile.open & {
+      display: none;
+    }
 }
 
 [data-once="home-branch-cookies-storage"] {

openy_home_branch/modules/ws_home_branch/assets/scss/ws-location-finder.scss

@@ -7,11 +7,12 @@
     border-color: var(--wsPrimaryColor, blue);
 
     label {
-      color: var(--wsPrimaryColor, blue);
+      color: var(--wsPrimaryColor, black);
 
       &:after {
-        background-image: url('../svg/add_circle_colorway.svg');
-        top: 0;
+        top: 2px;
+        background: var(--wsPrimaryColor, black);
+        mask: url("../svg/add_circle_colorway.svg") no-repeat left;
 
         @include media-breakpoint-down(lg) {
           top: -9px;
@@ -28,12 +29,13 @@
         color: var(--ylb-color-white);
 
         &:after {
-          background-image: url('../svg/check_circle.svg');
           right: -54px;
-          top: 3px;
+          top: 2px;
+          background: var(--y-color-white);
+          mask: url("../svg/check_circle.svg") no-repeat left;
 
           @include media-breakpoint-down(lg) {
-            top: -6px;
+            top: -9px;
           }
         }
       }

openy_home_branch/modules/ws_home_branch/assets/scss/ws-modal.scss

@@ -71,9 +71,10 @@
         font-size: 18px;
         font-family: var(--ylb-font-family-verdana);
         line-height: 26px;
+        margin-bottom: 0 !important;
 
         & > div {
-          margin-bottom: 55px;
+          margin-bottom: 45px;
           color: var(--ylb-color-dark-grey-1);
         }
 
@@ -86,7 +87,7 @@
             letter-spacing: 0.25px;
             text-transform: uppercase;
             font-weight: 700;
-            margin-bottom: 18px;
+            margin-bottom: 12px;
           }
 
           .select-wrapper {
@@ -116,12 +117,13 @@
           float: unset;
           width: 100%;
           background-color: var(--wsPartnerColor, black);
-          padding: 18px;
+          padding: 8px;
           font-size: 18px;
           font-family: var(--ylb-font-family-cachet);
           font-weight: 500;
           line-height: 30px;
           text-transform: none;
+          border-radius: 10px;
 
           @include media-breakpoint-up(md) {
             font-size: 24px;

openy_home_branch/modules/ws_home_branch/ws_home_branch.libraries.yml

@@ -5,7 +5,7 @@ ws_checkbox:
       assets/css/ws-checkbox.css: {}
 
 hb_header_lb_selector:
-  version: 0.1
+  version: 0.2
   js:
     assets/js/ws-header-lb-selector.js: {}
   css:
@@ -17,7 +17,7 @@ hb_header_lb_selector:
     - openy_home_branch/location_modal
 
 location_modal_override:
-  version: 0.1
+  version: 0.2
   js:
     assets/js/ws-modal.js: {}
   css:
@@ -29,7 +29,7 @@ location_modal_override:
     - openy_home_branch/hb_checkbox
 
 location_finder_override:
-  version: 0.1
+  version: 0.2
   js:
     assets/js/ws-location-finder.js: { }
   css:

openy_home_branch/modules/ws_home_branch/ws_home_branch.module

@@ -14,7 +14,7 @@ function ws_home_branch_preprocess_page(array &$variables) {
   if (\Drupal::hasService('plugin.manager.home_branch_library')) {
     $hb_plugin_service = \Drupal::service('plugin.manager.home_branch_library');
     $hb_plugin_service->attachHbLibrarySettings($variables, 'hb_location_finder', [
-      'locationsList' => '.block-inline-blocklb-openy-map .locations-list-lb',
+      'locationsList' => '.block-inline-blocklb-openy-map .locations-list-lb .row',
       'branchTeaserSelector' => '.node--type-branch.node--view-mode--lb-teaser ',
       'selectedText' => t('Preferred location'),
       'notSelectedText' => t('Preferred location'),