Merge branch 'master' of http://gitlab.invigroup.com/quan.nguyen/ptd

themes/contrib/estore/js/custom.js

@@ -88,16 +88,16 @@ $(".sidebar-submenu-3").eq(i).addClass('ul-flex');
 
   //  Custom menu
   $(".dropdown-toggle").mouseover(function() {
-    $(this).parent("li.expanded.dropdown").addClass("open");
+    // $(this).parent("li.expanded.dropdown").addClass("open");
   })
   $(".dropdown-menu").mouseover(function() {
-    $(this).parent("li.expanded.dropdown").addClass("open");
+    // $(this).parent("li.expanded.dropdown").addClass("open");
   })
   $(".dropdown-menu").mouseleave(function() {
-    $(this).parent("li.expanded.dropdown").removeClass("open");
+    // $(this).parent("li.expanded.dropdown").removeClass("open");
   })
   $(".dropdown-toggle").mouseleave(function() {
-    $(this).parent("li.expanded.dropdown").removeClass("open");
+    // $(this).parent("li.expanded.dropdown").removeClass("open");
   })
 
 

themes/contrib/estore/templates/commerce/commerce-product--teaser-mini.html.twig

@@ -21,13 +21,13 @@
 #}
 <article{{ attributes.addClass('commerce-product', 'teaser-mini', 'clearfix') }}>
   <div class="product-inner row">
-    <div class="col-sm-4">
+    <div class="col-xs-3 col-md-4 col-lg-4">
       <div class="product-image">
         {{ product.field_images[0] }}
         <div class="products-hover-wrapper"></div>
       </div>
     </div>
-    <div class="col-sm-8">
+    <div class="col-xs-9 col-md-8 col-lg-8">
       <div class="product-right">
         <h4 class="product-title">
           <a href="{{ product_url }}">{{ product.title }}</a>

themes/contrib/estore/templates/system/page.html.twig

@@ -131,71 +131,74 @@
       </div>
     </div>
   </div>
-  <div class="mobile-modal"></div>
-  <div class="middle-header-wrapper clearfix">
-    <div class="container-fluid">
-      <div class="col-md-3 col-xs-7">
-        {% if page.left_middle_header %}
-          {{ page.left_middle_header }}
-        {% endif %}
-      </div>
 
-      <div class="col-lg-6 col-md-6 col-xs-2 order-button  text-center">
-        <header{{ navbar_attributes.addclass(navbar_classes) }} id="navbar" role="banner">
-          <div class="navbar-header">
-            {% if page.middle_header %}
-              {{ page.middle_header }}
-            {% endif %}
-          </div>
-
-        </header>
-        <button type="button" name="button" class="btn-mobile-top">
-          <i class="fa fa-bars" aria-hidden="true"></i>
-        </button>
-      </div>
+  <div class="wrap-header">
+    <div class="middle-header-wrapper clearfix">
+      <div class="container-fluid">
+        <div class="col-md-3 col-xs-7">
+          {% if page.left_middle_header %}
+            {{ page.left_middle_header }}
+          {% endif %}
+        </div>
+        <div class="col-lg-6 col-md-6 col-xs-2 order-button  text-center">
+          <header{{ navbar_attributes.addclass(navbar_classes) }} id="navbar" role="banner">
+            <div class="navbar-header">
+              {% if page.middle_header %}
+                {{ page.middle_header }}
+              {% endif %}
+            </div>
 
-      <div class="col-md-3 col-lg-3 col-xs-3">
-        {% if page.right_middle_header %}
-          {{ page.right_middle_header }}
-        {% endif %}
+          </header>
+          <button type="button" name="button" class="btn-mobile-top">
+            <i class="fa fa-bars" aria-hidden="true"></i>
+          </button>
+        </div>
 
+        <div class="col-md-3 col-lg-3 col-xs-3">
+          {% if page.right_middle_header %}
+            {{ page.right_middle_header }}
+          {% endif %}
+        </div>
       </div>
-
     </div>
-  </div>
+    <header{{ navbar_attributes.addclass(navbar_classes, 'bottom-nav') }} id="navbar" role="banner">
+      {% if not navbar_attributes.hasClass(container) %}
+        <div class="{{ container }}">
+        {% endif %}
+        <div class="navbar-header">
 
-  <header{{ navbar_attributes.addclass(navbar_classes, 'bottom-nav') }} id="navbar" role="banner">
-    {% if not navbar_attributes.hasClass(container) %}
-      <div class="{{ container }}">
-      {% endif %}
-      <div class="navbar-header">
+          {{ page.navigation }}
+          <div class="row">
+            <div class="col-lg-3 col-xs-6 col-md-3">
+              {{page.right_bottom_header}}
 
-        {{ page.navigation }}
-        <div class="row">
-          <div class="col-lg-3 col-xs-6 col-md-3">
-            {{page.right_bottom_header}}
+            </div>
+            <div class="col-lg-6 col-md-6">
+              {{page.middle_bottom_header}}
+            </div>
+            <div class="col-lg-3 col-xs-6 col-md-3">
 
-          </div>
-          <div class="col-lg-6 col-md-6">
-            {{page.middle_bottom_header}}
-          </div>
-          <div class="col-lg-3 col-xs-6 col-md-3">
-            {{page.left_bottom_header}}
+              {{page.left_bottom_header}} 
+            </div>
           </div>
         </div>
-      </div>
 
-      {# Navigation (collapsible) #}
-      {% if page.navigation_collapsible %}
-        <div id="navbar-collapse" class="navbar-collapse collapse">
+        {# Navigation (collapsible) #}
+        {% if page.navigation_collapsible %}
+          <div id="navbar-collapse" class="navbar-collapse collapse">
 
-          {{ page.navigation_collapsible }}
+            {{ page.navigation_collapsible }}
+          </div>
+        {% endif %}
+        {% if not navbar_attributes.hasClass(container) %}
         </div>
       {% endif %}
-      {% if not navbar_attributes.hasClass(container) %}
-      </div>
-    {% endif %}
-  </header>
+    </header>
+
+  </div>
+
+  <div class="mobile-modal"></div>
+
 {% endblock %}
 
 {# Main #}

themes/contrib/estore/templates/views/views-view-unformatted--products--block-featured.html.twig

@@ -20,9 +20,9 @@
 <div id="estore-featured-products-carousel" class="features-products-carousel carousel slide" data-ride="carousel">
   <div class="featured-top">
     <div class="featured-title">
-      <h3 class="title">{{ 'Featured'|t }}</h3>
+      <h3 class="title">{{ 'Sản phẩm nổi bật'|t }}</h3>
       {% if view.display_handler.options['title'] != '' %}
-        <h4 class="sub-title">{{ view.display_handler.options['title']|t }}</h4>
+      {#  <h4 class="sub-title">{{ view.display_handler.options['title']|t }}</h4> #}
       {% endif %}
     </div>
     <div class="carousel-controls">