Merge pull request #63 from herbdool/issue-60

Issue #60: fix hamburger and alignment

Author: bugfolder

template.php

@@ -224,12 +224,7 @@ function bootstrap5_lite_preprocess_page(&$variables) {
 function bootstrap5_lite_preprocess_header(&$variables) {
   $variables['navigation'] = '';
   $navbar_menu_position = theme_get_setting('bootstrap5_lite_navbar_menu_position');
-  if ($navbar_menu_position == 'navbar-right') {
-    $variables['navbar_menu_position'] = 'd-flex justify-content-end';
-  }
-  else {
-    $variables['navbar_menu_position'] = 'd-flex justify-content-between';
-  }
+  $variables['navbar_menu_position'] = $navbar_menu_position;
 
   if ($navbar_position = theme_get_setting('bootstrap5_lite_navbar_user_menu')) {
     $user_menu = menu_tree('user-menu');
@@ -263,6 +258,9 @@ function bootstrap5_lite_links__header_menu($menu) {
   $menu['attributes']['class'] = array('menu','nav','navbar-nav');
   if ($navbar_menu_position = theme_get_setting('bootstrap5_lite_navbar_menu_position')) {
     $menu['attributes']['class'][] = $navbar_menu_position;
+    if ($navbar_menu_position == 'navbar-right') {
+      $menu['attributes']['class'][] = 'ms-auto';
+    }
   }
   foreach ($menu['links'] as $item => $link) {
     $menu['links'][$item]['attributes']['class'][] = 'nav-link';
@@ -295,7 +293,7 @@ function bootstrap5_lite_menu_tree__user_menu($variables) {
     $menu = menu_navigation_links('user-menu');
     $links = $menu ? theme('links__user_menu', array('links' => $menu)) : NULL;
     return '
-<div class="menu nav navbar-nav dropstart p-2">
+<div class="menu nav navbar-nav dropstart p-2 ms-auto">
   <div class="dropdown">
     <div data-toggle="dropdown" data-bs-toggle="dropdown"><i class="fa fa-cog"></i></div>
     ' . $links . '

templates/header.tpl.php

@@ -21,28 +21,22 @@
 ?>
 <header id="navbar" role="banner" class="<?php print implode(" ",$navbar_classes_array); ?>">
   <div class="<?php print $container_class;?>">
-    <div class="navbar-header">
-      <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
-      <button type="button" class="navbar-toggler" data-toggle="collapse" data-target=".navbar-collapse">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <?php if ($site_name || $logo): ?>
-        <a class="name navbar-brand" href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>">
-          <?php if ($logo): ?>
-            <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
-          <?php endif; ?>
-          <?php if ($site_name): ?>
-            <?php print $site_name; ?>
-          <?php endif; ?>
-        </a>
-      <?php endif; ?>
-    </div>
-    
+    <?php if ($site_name || $logo): ?>
+      <a class="name navbar-brand" href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>">
+        <?php if ($logo): ?>
+          <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
+        <?php endif; ?>
+        <?php if ($site_name): ?>
+          <?php print $site_name; ?>
+        <?php endif; ?>
+      </a>
+    <?php endif; ?>
+    <button type="button" class="navbar-toggler <?php print ($navbar_menu_position == 'navbar-right') ? 'ms-auto' : ''; ?>" data-bs-toggle="collapse" data-bs-target="#navbar-content" aria-controls="navbar-content" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
     <?php if ($navigation or $menu): ?>
-      <div class="navbar-collapse collapse <?php print $navbar_menu_position; ?>">
+      <div class="navbar-collapse collapse" id="navbar-content">
         <?php if ($menu) print $menu; ?>
         <?php if ($navigation) print $navigation; ?>
       </div>