Merge branch 'feature-theme' into 'develop'

add menu

See merge request manzarH/dic-global-dev!87

themes/custom/envigo/templates/layout/html.html.twig

@@ -46,50 +46,51 @@
       Keyboard navigation/accessibility link to main content section in
       page.html.twig.
     #}
-    <!-- search container box start -->
+<!-- search container box start -->
 <div class="h_site_search">
-  <div class="h_site_search_overlay"></div>
-  <div class="hh_site_search_box">
-    <div class="h_mod_input">
-      <form name="" action="" method="POST">
-        <input type="text" name="kw" value="" class="iSearchAssist" autocomplete="off">
-        <button type="submit"><i class="fa fa-search" aria-hidden="true"></i></button>
-      </form>
+    <div class="h_site_search_overlay"></div>
+    <div class="hh_site_search_box">
+        <div class="h_mod_input">
+            <form name="" action="" method="POST">
+                <input type="text" name="kw" value="" class="iSearchAssist" autocomplete="off">
+                <button type="submit"><i class="fa fa-search" aria-hidden="true"></i></button>
+            </form>
+        </div>
     </div>
-  </div>
 </div>
 <!-- search container box end -->
 
 
 <!-- change region container start -->
 <div class="h_header_langBox">
-  <div class="h_header_langBox_overlay"></div>
-  <div class="h_header_langBox_box">
-    <ul class="h_pure_g">
-      <li>
-        <div class="h_mod_button">
-          <a href="/ja/" target=""><span>日本語</span><i class="fa fa-angle-right" aria-hidden="true"></i></a>
-        </div>
-      </li>
-      <li>
-        <div class="h_mod_button">
-          <a href="/en/" target=""><span>ENGLISH</span><i class="fa fa-angle-right" aria-hidden="true"></i></a>
-        </div>
-      </li>
-      <li>
-        <div class="h_mod_button">
-          <a href="/cn/" target=""><span>中文</span><i class="fa fa-angle-right" aria-hidden="true"></i></a>
-        </div>
-      </li>
-      <li>
-        <div class="h_mod_button">
-          <a href="https://www.sunchemical.com/" target="_blank"><span>Sun Chemical</span><i class="fa fa-angle-right" aria-hidden="true"></i></a>
-        </div>
-      </li>
-    </ul>
-  </div>
+    <div class="h_header_langBox_overlay"></div>
+    <div class="h_header_langBox_box">
+        <ul class="h_pure_g">
+            <li>
+                <div class="h_mod_button">
+                    <a href="/ja/" target=""><span>日本語</span><i class="fa fa-angle-right" aria-hidden="true"></i></a>
+                </div>
+            </li>
+            <li>
+                <div class="h_mod_button">
+                    <a href="/en/" target=""><span>ENGLISH</span><i class="fa fa-angle-right" aria-hidden="true"></i></a>
+                </div>
+            </li>
+            <li>
+                <div class="h_mod_button">
+                    <a href="/cn/" target=""><span>中文</span><i class="fa fa-angle-right" aria-hidden="true"></i></a>
+                </div>
+            </li>
+            <li>
+                <div class="h_mod_button">
+                    <a href="https://www.sunchemical.com/" target="_blank"><span>Sun Chemical</span><i class="fa fa-angle-right" aria-hidden="true"></i></a>
+                </div>
+            </li>
+        </ul>
+    </div>
 </div>
 <!-- change region container start -->
+
     <a href="#main-content" class="visually-hidden focusable skip-link">
       {{ 'Skip to main content'|t }}
     </a>

themes/custom/envigo/templates/layout/page--front.html.twig

@@ -54,20 +54,18 @@
   </div>
 </div>
 
-
-
 {{ page.content }}
 
 
 {% if page.footer_top %}
 <div class="container-fluid spacerTB">
-         <div class="row">
-           <div class="container">
-             <div class="row mb-5">
-			 {{ page.footer_top }}
-			 </div>
-		</div>
+  <div class="row">
+    <div class="container">
+      <div class="row mb-5">
+        {{ page.footer_top }}
+      </div>
     </div>
+  </div>
 </div>
 {% endif %}
 

themes/custom/envigo/templates/layout/region--primary-menu.html.twig

@@ -19,8 +19,5 @@
   ]
 %}
 {% if content %}
-  	<div class="h_menu_c_b">
-    {{ content }}
-    </div>
-  
+	{{ content }}
 {% endif %}