Merge branch 'release-10.1' into dev

vufind-org · Jan 5, 2025 · 9c2b1f7 · 9c2b1f7
2 parents 6314818 + a3300c5
commit 9c2b1f7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 24 deletions.
diff --git a/themes/bootstrap3/less/variables.less b/themes/bootstrap3/less/variables.less
@@ -2,9 +2,6 @@
 // Cookie consent dialog should have a z-index low enough to stay below dropdowns and modals
 @zindex-cookie-consent: (@zindex-dropdown - 10);
 
-@pagination-active-bg: @brand-primary;
-@pagination-active-border: @brand-primary;
-
 // Variables used in Sidebar Menu Lists
 @myresearch-menu-ul-margin-bottom: 0;
 @myresearch-menu-ul-padding-left: 0;
@@ -13,9 +10,6 @@
 // Cookie consent dialog should have a z-index low enough to stay below dropdowns and modals
 $zindex-cookie-consent: (@zindex-dropdown - 10) !default;
 
-$pagination-active-bg: @brand-primary !default;
-$pagination-active-border: @brand-primary !default;
-
 $myresearch-menu-ul-margin-bottom: 0 !default;
 $myresearch-menu-ul-padding-left: 0 !default;
 <#SCSS */
diff --git a/themes/bootstrap3/scss/variables.scss b/themes/bootstrap3/scss/variables.scss
@@ -2,9 +2,6 @@
 // Cookie consent dialog should have a z-index low enough to stay below dropdowns and modals
 $zindex-cookie-consent: ($zindex-dropdown - 10);
 
-$pagination-active-bg: $brand-primary;
-$pagination-active-border: $brand-primary;
-
 // Variables used in Sidebar Menu Lists
 $myresearch-menu-ul-margin-bottom: 0;
 $myresearch-menu-ul-padding-left: 0;
@@ -13,9 +10,6 @@ $myresearch-menu-ul-padding-left: 0;
 // Cookie consent dialog should have a z-index low enough to stay below dropdowns and modals
 $zindex-cookie-consent: ($zindex-dropdown - 10) !default;
 
-$pagination-active-bg: $brand-primary !default;
-$pagination-active-border: $brand-primary !default;
-
 $myresearch-menu-ul-margin-bottom: 0 !default;
 $myresearch-menu-ul-padding-left: 0 !default;
 /* <#SCSS */
diff --git a/themes/bootstrap5/js/bs3-compat.js b/themes/bootstrap5/js/bs3-compat.js
@@ -1,5 +1,6 @@
 /*global VuFind*/
 VuFind.register('bootstrap3CompatibilityLayer', function bootstrap3CompatibilityLayer() {
+  const data_attribute_selector = '[data-dismiss],[data-target],[data-toggle],[data-ride],[data-slide],[data-slide-to]';
 
   function initNavbar() {
     document.querySelectorAll('.navbar').forEach((el) => {
@@ -114,13 +115,14 @@ VuFind.register('bootstrap3CompatibilityLayer', function bootstrap3Compatibility
   }
 
   function initDataAttributeMappings() {
-    document.querySelectorAll('[data-dismiss],[data-target],[data-toggle],[data-ride],[data-slide],[data-slide-to]').forEach((el) => {
-      convertDataAttributes(el);
-    });
+    document.querySelectorAll(data_attribute_selector).forEach((el) => convertDataAttributes(el));
     const observer = new MutationObserver((mutations) => {
       mutations.forEach((mutation) => {
         mutation.addedNodes.forEach((el) => {
           convertDataAttributes(el);
+          if (typeof el.querySelectorAll !== 'undefined') {
+            el.querySelectorAll(data_attribute_selector).forEach((subEl) => convertDataAttributes(subEl));
+          }
         });
       });
     });

diff --git a/themes/bootstrap5/scss/bootstrap-variable-overrides.scss b/themes/bootstrap5/scss/bootstrap-variable-overrides.scss
@@ -47,9 +47,6 @@ $form-switch-bg-image-dark:         none !default;
 $navbar-dark-toggler-icon-bg:       none !default;
 $navbar-light-toggler-icon-bg:      none !default;
 
-$pagination-active-bg:              $primary !default;
-$pagination-active-border:          $primary !default;
-
 $link-hover-decoration:             underline !default;
 $icon-link-underline-offset:        inherit !default;
 

diff --git a/themes/bootstrap5/scss/variables.scss b/themes/bootstrap5/scss/variables.scss
@@ -2,9 +2,6 @@
 // Cookie consent dialog should have a z-index low enough to stay below dropdowns and modals
 $zindex-cookie-consent: ($zindex-dropdown - 10);
 
-$pagination-active-bg: $brand-primary;
-$pagination-active-border: $brand-primary;
-
 // Variables used in Sidebar Menu Lists
 $myresearch-menu-ul-margin-bottom: 0;
 $myresearch-menu-ul-padding-left: 0;
@@ -13,9 +10,6 @@ $myresearch-menu-ul-padding-left: 0;
 // Cookie consent dialog should have a z-index low enough to stay below dropdowns and modals
 $zindex-cookie-consent: ($zindex-dropdown - 10) !default;
 
-$pagination-active-bg: $brand-primary !default;
-$pagination-active-border: $brand-primary !default;
-
 $myresearch-menu-ul-margin-bottom: 0 !default;
 $myresearch-menu-ul-padding-left: 0 !default;
 /* <#SCSS */