Upgrade Bootstrap from 5.2 to 5.3

6 files changed, 29 insertions, 38 deletions

diff --git a/resources/views/admin/data-fix-page.phtml b/resources/views/admin/data-fix-page.phtml
index 32ced21f44..97b6111e09 100644
--- a/resources/views/admin/data-fix-page.phtml
+++ b/resources/views/admin/data-fix-page.phtml
@@ -86,8 +86,8 @@ use Fisharebest\Webtrees\View;
 </div>
 
 <div id="data-fix-progress" class="d-none">
-    <div class="progress">
-        <div class="progress-bar" role="progressbar"></div>
+    <div class="progress" role="progressbar">
+        <div class="progress-bar"></div>
     </div>
 </div>
 
diff --git a/resources/views/admin/import-progress.phtml b/resources/views/admin/import-progress.phtml
index e3d8ab06af..215bca6c9b 100644
--- a/resources/views/admin/import-progress.phtml
+++ b/resources/views/admin/import-progress.phtml
@@ -15,15 +15,13 @@ use Fisharebest\Webtrees\Tree;
 
 ?>
 
-<div class="progress" id="progress<?= e($tree->id()) ?>">
-    <div
-        class="progress-bar"
-        role="progressbar"
-        aria-valuenow="<?= $progress * 100 ?>"
-        aria-valuemin="0"
-        aria-valuemax="100"
-        style="min-width: <?= $progress * 100 ?>%;"
-    >
+<div class="progress" id="progress<?= e($tree->id()) ?>"
+     role="progressbar"
+     aria-valuenow="<?= $progress * 100 ?>"
+     aria-valuemin="0"
+     aria-valuemax="100"
+>
+    <div class="progress-bar" style="min-width: <?= $progress * 100 ?>%;">
         <?= $status ?: I18N::percentage($progress, 1) ?>
     </div>
 </div>
diff --git a/resources/views/admin/modules.phtml b/resources/views/admin/modules.phtml
index 6ba576f65e..809baf5269 100644
--- a/resources/views/admin/modules.phtml
+++ b/resources/views/admin/modules.phtml
@@ -152,7 +152,7 @@ use Illuminate\Support\Collection;
                             <?= view('admin/external-module-info', ['module' => $module]) ?>
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted" title="<?= I18N::translate('Preferences') ?>">
+                    <td class="text-center" title="<?= I18N::translate('Preferences') ?>">
                         <?php if ($module instanceof ModuleConfigInterface) : ?>
                             <?php if ($module->isEnabled()) : ?>
                                 <a href="<?= e($module->getConfigLink()) ?>" title="<?= I18N::translate('Preferences') ?>">
@@ -166,7 +166,7 @@ use Illuminate\Support\Collection;
                             <?php endif ?>
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted" title="<?= I18N::translate('Menu') ?>">
+                    <td class="text-center" title="<?= I18N::translate('Menu') ?>">
                         <?php if ($module instanceof ModuleMenuInterface) : ?>
                             <?= view('icons/menu') ?>
                             <span class="visually-hidden"><?= I18N::translate('Menu') ?></span>
@@ -174,7 +174,7 @@ use Illuminate\Support\Collection;
                             -
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted" title="<?= I18N::translate('Tab') ?>">
+                    <td class="text-center" title="<?= I18N::translate('Tab') ?>">
                         <?php if ($module instanceof ModuleTabInterface) : ?>
                             <?= view('icons/tab') ?>
                             <span class="visually-hidden"><?= I18N::translate('Tab') ?></span>
@@ -182,7 +182,7 @@ use Illuminate\Support\Collection;
                             -
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted" title="<?= I18N::translate('Sidebar') ?>">
+                    <td class="text-center" title="<?= I18N::translate('Sidebar') ?>">
                         <?php if ($module instanceof ModuleSidebarInterface) : ?>
                             <?= view('icons/sidebar') ?>
                             <span class="visually-hidden"><?= I18N::translate('Sidebar') ?></span>
@@ -190,7 +190,7 @@ use Illuminate\Support\Collection;
                             -
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted">
+                    <td class="text-center">
                         <?php if ($module instanceof ModuleBlockInterface) : ?>
                             <?php if ($module->isUserBlock()) : ?>
                                 <span title="<?= I18N::translate('My page') ?>">
@@ -213,7 +213,7 @@ use Illuminate\Support\Collection;
                             -
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted" title="<?= I18N::translate('Data fix') ?>">
+                    <td class="text-center" title="<?= I18N::translate('Data fix') ?>">
                         <?php if ($module instanceof ModuleDataFixInterface) : ?>
                             <?= view('icons/data-fix') ?>
                             <span class="visually-hidden"><?= I18N::translate('Data fix') ?></span>
@@ -221,7 +221,7 @@ use Illuminate\Support\Collection;
                             -
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted" title="<?= I18N::translate('Chart') ?>">
+                    <td class="text-center" title="<?= I18N::translate('Chart') ?>">
                         <?php if ($module instanceof ModuleChartInterface) : ?>
                             <?= view('icons/chart') ?>
                             <span class="visually-hidden"><?= I18N::translate('Chart') ?></span>
@@ -229,7 +229,7 @@ use Illuminate\Support\Collection;
                             -
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted" title="<?= I18N::translate('List') ?>">
+                    <td class="text-center" title="<?= I18N::translate('List') ?>">
                         <?php if ($module instanceof ModuleListInterface) : ?>
                             <?= view('icons/list') ?>
                             <span class="visually-hidden"><?= I18N::translate('List') ?></span>
@@ -237,7 +237,7 @@ use Illuminate\Support\Collection;
                             -
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted" title="<?= I18N::translate('Report') ?>">
+                    <td class="text-center" title="<?= I18N::translate('Report') ?>">
                         <?php if ($module instanceof ModuleReportInterface) : ?>
                             <?= view('icons/report') ?>
                             <span class="visually-hidden"><?= I18N::translate('Report') ?></span>
@@ -245,7 +245,7 @@ use Illuminate\Support\Collection;
                             -
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted" title="<?= I18N::translate('Footer') ?>">
+                    <td class="text-center" title="<?= I18N::translate('Footer') ?>">
                         <?php if ($module instanceof ModuleFooterInterface) : ?>
                             <?= view('icons/footer') ?>
                             <span class="visually-hidden"><?= I18N::translate('Footer') ?></span>
@@ -253,7 +253,7 @@ use Illuminate\Support\Collection;
                             -
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted" title="<?= I18N::translate('Tracking and analytics') ?>">
+                    <td class="text-center" title="<?= I18N::translate('Tracking and analytics') ?>">
                         <?php if ($module instanceof ModuleAnalyticsInterface) : ?>
                             <?= view('icons/analytics') ?>
                             <span class="visually-hidden"><?= I18N::translate('Tracking and analytics') ?></span>
@@ -261,7 +261,7 @@ use Illuminate\Support\Collection;
                             -
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted" title="<?= I18N::translate('Historic events') ?>">
+                    <td class="text-center" title="<?= I18N::translate('Historic events') ?>">
                         <?php if ($module instanceof ModuleHistoricEventsInterface) : ?>
                             <?= view('icons/history') ?>
                             <span class="visually-hidden"><?= I18N::translate('Historic events') ?></span>
@@ -269,7 +269,7 @@ use Illuminate\Support\Collection;
                             -
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted" title="<?= I18N::translate('Theme') ?>">
+                    <td class="text-center" title="<?= I18N::translate('Theme') ?>">
                         <?php if ($module instanceof ModuleThemeInterface) : ?>
                             <?= view('icons/theme') ?>
                             <span class="visually-hidden"><?= I18N::translate('Theme') ?></span>
@@ -277,7 +277,7 @@ use Illuminate\Support\Collection;
                             -
                         <?php endif ?>
                     </td>
-                    <td class="text-center text-muted" title="<?= I18N::translate('Language') ?>">
+                    <td class="text-center" title="<?= I18N::translate('Language') ?>">
                         <?php if ($module instanceof ModuleLanguageInterface) : ?>
                             <?= view('icons/language') ?>
                             <span class="visually-hidden"><?= I18N::translate('Language') ?></span>
diff --git a/resources/views/admin/trees.phtml b/resources/views/admin/trees.phtml
index 34b267ad3f..d8c37edf71 100644
--- a/resources/views/admin/trees.phtml
+++ b/resources/views/admin/trees.phtml
@@ -69,8 +69,8 @@ use Illuminate\Database\Capsule\Manager as DB;
                         <?php $importing = DB::table('gedcom_chunk')->where('gedcom_id', '=', $managed_tree->id())->where('imported', '=', 0)->exists() ?>
                         <?php if ($importing) : ?>
                             <div id="import<?= $managed_tree->id() ?>" class="col-12">
-                                <div class="progress">
-                                    <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">
+                                <div class="progress" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">
+                                    <div class="progress-bar">
                                         <?= I18N::translate('Calculating…') ?>
                                     </div>
                                 </div>
diff --git a/resources/views/components/progress.phtml b/resources/views/components/progress.phtml
index c3dd06ca8e..47a0eff5f1 100644
--- a/resources/views/components/progress.phtml
+++ b/resources/views/components/progress.phtml
@@ -10,15 +10,8 @@ use Fisharebest\Webtrees\I18N;
 
 ?>
 
-<div class="progress">
-    <div
-    class="progress-bar"
-    role="progressbar"
-    aria-valuenow="<?= $progress * 100 ?>"
-    aria-valuemin="0"
-    aria-valuemax="100"
-    style="width: <?= $progress * 100 ?>%; min-width: 2.5rem;"
-    >
+<div class="progress" role="progressbar" aria-valuenow="<?= $progress * 100 ?>" aria-valuemin="0" aria-valuemax="100">
+    <div class="progress-bar" style="width: <?= $progress * 100 ?>%; min-width: 2.5rem;">
         <?= I18N::percentage($progress, 1) ?>
     </div>
 </div>
diff --git a/resources/views/modules/place-hierarchy/events.phtml b/resources/views/modules/place-hierarchy/events.phtml
index f75f18be8c..db30675b75 100644
--- a/resources/views/modules/place-hierarchy/events.phtml
+++ b/resources/views/modules/place-hierarchy/events.phtml
@@ -18,13 +18,13 @@ use Illuminate\Support\Collection;
 
 <ul class="nav nav-tabs" role="tablist">
     <li class="nav-item" role="presentation">
-        <a class="nav-link active<?= $indilist->isEmpty() ? ' text-muted' : '' ?>" data-bs-toggle="tab" role="tab" href="#individuals">
+        <a class="nav-link active" data-bs-toggle="tab" role="tab" href="#individuals">
             <?= I18N::translate('Individuals') ?>
             <?= view('components/badge', ['count' => count($indilist)]) ?>
         </a>
     </li>
     <li class="nav-item" role="presentation">
-        <a class="nav-link<?= $famlist->isEmpty() ? ' text-muted' : '' ?>" data-bs-toggle="tab" role="tab" href="#families">
+        <a class="nav-link" data-bs-toggle="tab" role="tab" href="#families">
             <?= I18N::translate('Families') ?>
             <?= view('components/badge', ['count' => count($famlist)]) ?>
         </a>