Merge pull request #39 from bootscore/Add-new-header-widget

Update header.php
bootscore · Apr 15, 2023 · 5093ce2 · 5093ce2
2 parents a371f5e + 5a568a1
commit 5093ce2
Showing 1 changed file with 28 additions and 26 deletions.
diff --git a/header.php b/header.php
@@ -51,11 +51,12 @@
 
             <!-- Offcanvas Navbar -->
             <div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvas-navbar">
-              <div class="offcanvas-header bg-light">
-                <span class="h5 mb-0"><?php esc_html_e('Menu', 'bootscore'); ?></span>
+              <div class="offcanvas-header">
+                <span class="h5 offcanvas-title"><?php esc_html_e('Menu', 'bootscore'); ?></span>
                 <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
               </div>
               <div class="offcanvas-body">
+
                 <!-- Bootstrap 5 Nav Walker Main Menu -->
                 <?php
                 wp_nav_menu(array(
@@ -68,25 +69,28 @@
                   'walker' => new bootstrap_5_wp_nav_menu_walker()
                 ));
                 ?>
-                <!-- Bootstrap 5 Nav Walker Main Menu End -->
+
+                <!-- Top Nav 2 Widget -->
+                <?php if (is_active_sidebar('top-nav-2')) : ?>
+                  <?php dynamic_sidebar('top-nav-2'); ?>
+                <?php endif; ?>           
+
               </div>
             </div>
 
             <div class="header-actions d-flex align-items-center">
 
               <!-- Top Nav Widget -->
-              <div class="top-nav-widget">
-                <?php if (is_active_sidebar('top-nav')) : ?>
-                  <div>
-                    <?php dynamic_sidebar('top-nav'); ?>
-                  </div>
-                <?php endif; ?>
-              </div>
+              <?php if (is_active_sidebar('top-nav')) : ?>
+                <?php dynamic_sidebar('top-nav'); ?>
+              <?php endif; ?>
 
               <!-- Search Toggler -->
-              <button class="btn btn-outline-secondary ms-1 ms-md-2 top-nav-search-md" type="button" data-bs-toggle="collapse" data-bs-target="#collapse-search" aria-expanded="false" aria-controls="collapse-search">
-                <i class="fa-solid fa-magnifying-glass"></i><span class="visually-hidden-focusable">Search</span>
-              </button>
+              <?php if (is_active_sidebar('top-nav-search')) : ?>
+                <button class="btn btn-outline-secondary ms-1 ms-md-2 top-nav-search-md" type="button" data-bs-toggle="collapse" data-bs-target="#collapse-search" aria-expanded="false" aria-controls="collapse-search">
+                  <i class="fa-solid fa-magnifying-glass"></i><span class="visually-hidden-focusable">Search</span>
+                </button>
+              <?php endif; ?>
 
               <!-- User Toggler -->
               <button class="btn btn-outline-secondary ms-1 ms-md-2" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvas-user" aria-controls="offcanvas-user">
@@ -115,25 +119,23 @@
 
             </div><!-- .header-actions -->
 
-          </div><!-- .<?php echo bootscore_container_class(); ?> -->
+          </div><!-- bootscore_container_class(); -->
 
         </nav><!-- .navbar -->
 
-        <!-- Top Nav Search Collapse -->
-        <div class="collapse <?php echo bootscore_container_class(); ?>" id="collapse-search">
-          <?php if (is_active_sidebar('top-nav-search')) : ?>
-            <div class="mb-2">
-              <?php dynamic_sidebar('top-nav-search'); ?>
-            </div>
-          <?php endif; ?>
-        </div>
+        <!-- Top Nav Search Collapse -->        
+        <?php if (is_active_sidebar('top-nav-search')) : ?>
+          <div class="collapse <?php echo bootscore_container_class(); ?> mb-2" id="collapse-search">
+            <?php dynamic_sidebar('top-nav-search'); ?>
+          </div>
+        <?php endif; ?>
 
       </div><!-- .fixed-top .bg-light -->
 
       <!-- offcanvas user -->
       <div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvas-user">
-        <div class="offcanvas-header bg-light">
-          <span class="h5 mb-0"><?php esc_html_e('Account', 'bootscore'); ?></span>
+        <div class="offcanvas-header">
+          <span class="h5 offcanvas-title"><?php esc_html_e('Account', 'bootscore'); ?></span>
           <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
         </div>
         <div class="offcanvas-body">
@@ -145,8 +147,8 @@
 
       <!-- offcanvas cart -->
       <div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvas-cart">
-        <div class="offcanvas-header bg-light">
-          <span class="h5 mb-0"><?php esc_html_e('Cart', 'bootscore'); ?></span>
+        <div class="offcanvas-header">
+          <span class="h5 offcanvas-title"><?php esc_html_e('Cart', 'bootscore'); ?></span>
           <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
         </div>
         <div class="offcanvas-body p-0">