Merge pull request #101 from gskema/refactor

[*] FO: Refactor blockcontact for Bootstrap nav

themes/community-theme-16/modules/blockcontact/nav.tpl

@@ -1,8 +1,15 @@
-<div id="contact-link" {if isset($is_logged) && $is_logged} class="is_logged"{/if}>
-  <a href="{$link->getPageLink('contact', true)|escape:'html':'UTF-8'}" title="{l s='Contact us' mod='blockcontact'}">{l s='Contact us' mod='blockcontact'}</a>
-</div>
-{if $telnumber}
-  <span class="shop-phone{if isset($is_logged) && $is_logged} is_logged{/if}">
-    <i class="icon icon-phone"></i> {l s='Call us now:' mod='blockcontact'} <strong>{$telnumber}</strong>
-  </span>
+<li id="blockcontact-contact" class="blockcontact">
+  <a href="{$link->getPageLink('contact', true)|escape:'html':'UTF-8'}" title="{l s='Contact us' mod='blockcontact'}">
+    {l s='Contact us' mod='blockcontact'}
+  </a>
+</li>
+
+{if !empty($telnumber)}
+  <li id="blockcontact-phone" class="blockcontact">
+    <p class="navbar-text">
+      <i class="icon icon-phone"></i>
+      {l s='Call us now:' mod='blockcontact'}
+      <a class="phone-link" href="tel:{$telnumber|escape:'html':'UTF-8'}">{$telnumber|escape:'html':'UTF-8'}</a>
+    </p>
+  </li>
 {/if}

themes/community-theme-16/sass/modules/blockcontact/blockcontact.scss

@@ -2,57 +2,6 @@
 @import "./../../theme_variables";
 @import "./../../vendor_variables";
 
-.shop-phone {
-  float: left;
-  padding: 5px 0 10px;
-  line-height:18px;
-  color: #ccc;
-  @media (max-width: $screen-xs-max) {
-    display: none;
-  }
-  i {
-    font-size: 21px;
-    line-height: 21px;
-    color: #fff;
-    padding-right: 7px;
-  }
-  strong {
-    color: #fff;
-  }
-  &.is_logged {
-    @media (max-width: $screen-sm-max) {
-      display: none;
-    }
-  }
-}
-#contact-link {
-  float: right;
-  border-left: 1px solid #515151;
-  @media (max-width: $screen-xs - 1) {
-    text-align: center;
-  }
-  a {
-    display: block;
-    color: #fff;
-    font-weight: bold;
-    padding: 8px 10px 11px 10px;
-    cursor: pointer;
-    line-height:18px;
-    @media (max-width: $screen-xs - 1) {
-      font-size: 11px;
-      padding-left: 5px;
-      padding-right: 5px;
-    }
-    &:hover, &.active {
-      background: #2b2b2b;
-    }
-  }
-  &.is_logged {
-    @media (max-width: $screen-xs-max) {
-      display: none;
-    }
-  }
-}
 #contact_block {
   @media (max-width: $screen-xs-max) { // max 767px
     margin-bottom: 20px;