Merge branch 'main' of http://91.189.216.43:3000/jacek.pyziak/interblue.pl

themes/InterBlue/assets/css/custom.css

@@ -771,4 +771,34 @@ article.product-miniature .discount-percentage.discount-percentage {
   display: flex;
   align-items: center;
   flex-wrap: wrap;
+}
+
+#_desktop_contact_link_temp {
+  display: none;
+}
+
+#nav-phone-numb {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin-left: 10px;
+  -moz-column-gap: 5px;
+       column-gap: 5px;
+  height: 50px;
+}
+#nav-phone-numb i {
+  font-size: 21px;
+}
+#nav-phone-numb a {
+  color: #f57e20;
+}
+
+@media (max-width: 767px) {
+  footer#footer .footer-container .block-contact .hidden-sm-down {
+    display: block !important;
+    padding: 0.625rem;
+  }
+  footer#footer .footer-container .block-contact .hidden-md-up {
+    display: none !important;
+  }
 }/*# sourceMappingURL=custom.css.map */

themes/InterBlue/assets/css/custom.scss

@@ -838,3 +838,44 @@ article.product-miniature {
 		}
 	}
 }
+
+#_desktop_contact_link_temp {
+	display: none;
+}
+
+#nav-phone-numb {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	margin-left: 10px;
+	column-gap: 5px;
+	height: 50px;
+
+	i {
+		font-size: 21px;
+	}
+
+	a {
+		color: #f57e20;
+	}
+}
+
+footer#footer {
+	@media (max-width: 767px) {
+		.footer-container {
+			.block-contact {
+				.hidden-sm-down {
+					display: block !important;
+					padding: 0.625rem;
+
+					.block-contact-title {
+					}
+				}
+
+				.hidden-md-up {
+					display: none !important;
+				}
+			}
+		}
+	}
+}

themes/InterBlue/assets/js/custom.js

@@ -49,3 +49,66 @@ $(function () {
 		$("#btn_continue_shopping").trigger("click")
 	})
 })
+
+
+$(function () {
+    $(window).on("load", function () {
+        let phoneBox = $("#_desktop_contact_link_temp").html();
+        $('#nav-phone-numb').html(phoneBox);
+    });
+});
+
+$(function () {
+    let originalParent = $("#st_banner_11").parent();
+    let originalPosition = $("#st_banner_11").index();
+
+    function moveBanner() {
+        let banner = $("#st_banner_11");
+        let targetSection = $("#content-wrapper #content .blog.blocks.displayHome");
+
+        if ($(window).width() <= 767) {
+            if (banner.parent().attr("id") !== "content") {
+                banner.detach().insertBefore(targetSection);
+            }
+        } else {
+            if (banner.parent().attr("id") !== originalParent.attr("id")) {
+                if (originalPosition === 0) {
+                    originalParent.prepend(banner);
+                } else {
+                    banner.detach().insertAfter(originalParent.children().eq(originalPosition - 1));
+                }
+            }
+        }
+    }
+    moveBanner();
+    $(window).on("resize", moveBanner);
+});
+
+
+$(function () {
+    let originalParentCustomText = $("#custom-text").parent();
+    let originalPositionCustomText = $("#custom-text").index();
+
+    function moveCustomText() {
+        let customText = $("#custom-text");
+        let banner = $("#st_banner_11");
+
+        if ($(window).width() <= 576) {
+            if (customText.next("#st_banner_11").length === 0) {
+                customText.detach().insertAfter(banner);
+            }
+        } else {
+            if (customText.parent().attr("id") !== originalParentCustomText.attr("id")) {
+                if (originalPositionCustomText === 0) {
+                    originalParentCustomText.prepend(customText);
+                } else {
+                    customText.detach().insertAfter(originalParentCustomText.children().eq(originalPositionCustomText - 1));
+                }
+            }
+        }
+    }
+
+    moveCustomText();
+
+    $(window).on("resize", moveCustomText);
+});

themes/InterBlue/modules/ps_contactinfo/nav.tpl

@@ -25,7 +25,7 @@
 <div id="_desktop_contact_link">
   <div id="contact-link">
     {if $contact_infos.phone}
-    <div class="contact-info-phone">
+    <div id="_desktop_info-phone" class="contact-info-phone">
       {* [1][/1] is for a HTML tag. *}
       {l
         s='<i class="material-icons">call</i> [1]%phone%[/1]'
@@ -36,7 +36,7 @@
         ]
         d='Shop.Theme.Global'
       }
-      </div>
+    </div>
 {if $contact_infos.email}
     <div class="contact-info-email">
         {* [1][/1] is for a HTML tag. *}
@@ -61,3 +61,16 @@
     </div>
   </div>
 </div>
+
+
+<div id="_desktop_contact_link_temp">
+  {l
+    s='<i class="material-icons">call</i> [1]%phone%[/1]'
+    sprintf=[
+      '[1]' => '<a href="tel:'|cat:$contact_infos.phone|cat:'" class="dropdown">',
+      '[/1]' => '</a>',
+      '%phone%' => $contact_infos.phone
+    ]
+    d='Shop.Theme.Global'
+  }
+</div>

themes/InterBlue/templates/_partials/header.tpl

@@ -29,7 +29,7 @@
 {/block}
 
 {block name='header_nav'}
-  <nav class="header-nav">
+  <nav class="header-nav 1">
     <div class="container">
       <div class="row">
         <div class="hidden-sm-down">
@@ -41,12 +41,17 @@
           </div>
         </div>
         <div class="hidden-md-up text-sm-center mobile">
-          <div class="float-xs-left" id="menu-icon">
+          {* <div class="menu-mobile"> *}
-            <i class="material-icons d-inline">&#xE5D2;</i>
+            <div class="float-xs-left" id="menu-icon">
-          </div>
+              <i class="material-icons d-inline">&#xE5D2;</i>
-          <div class="float-xs-right" id="_mobile_cart"></div>
+            </div>
-          <div class="float-xs-right" id="_mobile_user_info"></div>
+            <div class="float-xs-left" id="nav-phone-numb">
-          <div class="clearfix"></div>
+            </div>
+
+            <div class="float-xs-right" id="_mobile_cart"></div>
+            <div class="float-xs-right" id="_mobile_user_info"></div>
+            <div class="clearfix"></div>
+          {* </div> *}
         </div>
       </div>
     </div>
@@ -60,11 +65,11 @@
         <div class="col-md-2 hidden-sm-down" id="_desktop_logo">
             {if $page.page_name == 'index'}
                 <a href="{$urls.base_url}">
-                  <img class="logo img-responsive" src="{$shop.logo}" alt="{$shop.name}">
+                  <img class="logo img-responsive" src="{$shop.logo}" alt="{$shop.name}" width="131" height="76">
                 </a>
             {else}
                 <a href="{$urls.base_url}">
-                  <img class="logo img-responsive" src="{$shop.logo}" alt="{$shop.name}">
+                  <img class="logo img-responsive" src="{$shop.logo}" alt="{$shop.name}" width="131" height="76">
                 </a>
             {/if}
         </div>
@@ -84,5 +89,14 @@
       </div>
     </div>
   </div>
+  <script>
+  /*const CanonicalCreate = () =>{
+    if(window.location.href=="https://www.interblue.pl/brands"){
+    var meta = document.createElement('link');
+    meta.rel = "canonical";
+    meta.href = "https://www.interblue.pl/brands";
+    document.getElementsByTagName('head')[0].appendChild(meta);}}
+  CanonicalCreate();*/
+  </script>
   {hook h='displayNavFullWidth'}
 {/block}