Upgrade Bootstrap from 4 to 5. Fixes: #3673. Fixes: #3400.

8 files changed, 48 insertions, 74 deletions

diff --git a/resources/css/_base.css b/resources/css/_base.css
index 9bfab9dfe6..bcf72d3def 100644
--- a/resources/css/_base.css
+++ b/resources/css/_base.css
@@ -36,61 +36,12 @@
     transform: scale(-1, 1);
 }
 
-/* Bootstrap 4.5.1 toggle buttons don't work when labels have additional markup */
-[data-toggle=buttons] > label > .wt-icon-sex {
-    pointer-events: none;
-}
-
-/* Remove border-radius for left-to-right input groups on right-to-left pages */
-[dir=rtl] .input-group[dir=ltr] [dir=ltr] {
-    border-radius: 0;
-}
-
 /* rtl:ignore */
 td.align-digits,
 th.align-digits {
     text-align: right;
 }
 
-/* Allows twitter typeahead to work with bootstrap input groups */
-.input-group > .twitter-typeahead {
-    flex: 1 1;
-}
-
-/* Allows select2 to work with bootstrap input groups */
-.input-group > .select2-container {
-    flex: 1 1;
-}
-
-/* Workaround for dropdown menu position on RTL with popper.js */
-/* See also https://github.com/FezVrasta/popper.js/issues/695 */
-[dir=rtl] .wt-genealogy-menu .dropdown-menu {
-    right: 0;
-    left: auto !important;
-}
-
-/*
- * https://github.com/fisharebest/webtrees/issues/2291
- * Chrome 72 has problems with all cards in the control panel.
- * Chrome 73 has problems with the family-tree card in the control panel.
- * Chrome 76 seems OK.
- * https://github.com/fisharebest/webtrees/issues/2813
- * Safari 13 has the same issue.
- */
-.wt-control-panel .card {
-    display: block;
-}
-
-/*
- * Flexbox fixes for IE11
- */
-@media (-ms-high-contrast: active), (-ms-high-contrast: none) {
-    /* Move the body down below the mangled header */
-    div.wt-main-container {
-        padding-top: 4rem;
-    }
-}
-
 /* Keep the page as tall as the window, so the footer can remain at the bottom. */
 .wt-global {
     display: flex;
@@ -102,6 +53,15 @@ th.align-digits {
     flex: 1;
 }
 
+/* Bootstrap 5 underlines links by default */
+a {
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
 /* Scrollbars */
 .wt-global {
     /* Prevent redraws when dynamic content requires a scrollbar. */
@@ -117,8 +77,8 @@ th.align-digits {
 }
 
 /* Expand/collapse icons on accordions, etc. */
-[data-toggle=collapse][aria-expanded=true] > .wt-icon-expand {
+[data-bs-toggle=collapse][aria-expanded=true] > .wt-icon-expand {
     display: none;
-}[data-toggle=collapse][aria-expanded=false] > .wt-icon-collapse {
+}[data-bs-toggle=collapse][aria-expanded=false] > .wt-icon-collapse {
     display: none;
 }
diff --git a/resources/css/_vendor-patches.css b/resources/css/_vendor-patches.css
index b323c09757..886ffb3e53 100644
--- a/resources/css/_vendor-patches.css
+++ b/resources/css/_vendor-patches.css
@@ -16,3 +16,30 @@
 /*
  * Temporary fixes for things that are broken upstream.
  */
+
+/*
+ * https://github.com/fisharebest/webtrees/issues/2291
+ * Chrome 72 has problems with all cards in the control panel.
+ * Chrome 73 has problems with the family-tree card in the control panel.
+ * Chrome 76 seems OK.
+ * https://github.com/fisharebest/webtrees/issues/2813
+ * Safari 13 has the same issue.
+ */
+.wt-control-panel .card {
+    display: block;
+}
+
+/* Allow font-awesome icon lists to work on RTL pages */
+[dir=rtl] .fa-li {
+    right: -2rem;
+}
+
+/* Allows twitter typeahead to work with bootstrap input groups */
+.input-group > .twitter-typeahead {
+    flex: 1 1;
+}
+
+/* Allows select2 to work with bootstrap input groups */
+.input-group > .select2-container {
+    flex: 1 1;
+}
diff --git a/resources/css/administration.css b/resources/css/administration.css
index 9cde715416..b9fc399292 100644
--- a/resources/css/administration.css
+++ b/resources/css/administration.css
@@ -113,3 +113,5 @@ h4 {
     float: right;
     border: 0;
 }
+
+
diff --git a/resources/css/clouds.css b/resources/css/clouds.css
index 8ce18e5c8f..131f1da8c8 100755
--- a/resources/css/clouds.css
+++ b/resources/css/clouds.css
@@ -600,12 +600,12 @@ footer,
     border-radius: 3px;
 }
 
-a {
+a, .nav-link {
     color: #039;
     text-decoration: none;
 }
 
-a:hover {
+a:hover, .nav-link:hover {
     color: #f00;
     text-decoration: none;
 }
diff --git a/resources/css/fab.css b/resources/css/fab.css
index 3be59d646e..fc99667d02 100755
--- a/resources/css/fab.css
+++ b/resources/css/fab.css
@@ -362,13 +362,12 @@ table {
     border-radius: 4px;
 }
 
-a {
+a, .nav-link {
     text-decoration: none;
     color: #369;
 }
 
-a:hover,
-a:active {
+a:hover {
     text-decoration: underline;
 }
 
diff --git a/resources/css/minimal.css b/resources/css/minimal.css
index 9cecdaa32e..ce445b6aba 100755
--- a/resources/css/minimal.css
+++ b/resources/css/minimal.css
@@ -424,20 +424,6 @@ table {
     border: solid #000 1px;
 }
 
-a {
-    color: #333;
-    text-decoration: none;
-}
-
-a:hover {
-    color: #333;
-    text-decoration: underline;
-}
-
-a:hover {
-    text-decoration: underline!important;
-}
-
 .parentdeath {
     padding: 1px;
 }
diff --git a/resources/css/webtrees.css b/resources/css/webtrees.css
index 8bbd770e08..3a8d711579 100755
--- a/resources/css/webtrees.css
+++ b/resources/css/webtrees.css
@@ -547,12 +547,12 @@ table {
     border: solid var(--sex-m-fg) thin;
 }
 
-a {
+a, .nav-link {
     color: #555;
     text-decoration: none;
 }
 
-a:hover {
+a:hover, .nav-link:hover {
     color: #f00;
     text-decoration: none;
 }
diff --git a/resources/css/xenea.css b/resources/css/xenea.css
index b61b18c991..00583fa303 100755
--- a/resources/css/xenea.css
+++ b/resources/css/xenea.css
@@ -547,12 +547,12 @@ table {
 
 /* ====== Round Corners ======== */
 
-a {
+a, .nav-link {
     color: #00f;
     text-decoration: none;
 }
 
-a:hover {
+a:hover, .nav-link:hover {
     color: #f00;
     text-decoration: none;
 }