Merge branch 'release-10.1' into dev

vufind-org · Jan 28, 2025 · 6b1ac1e · 6b1ac1e
2 parents 83e0e2f + 5f1ba2d
commit 6b1ac1e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/ResponsivenessTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/ResponsivenessTest.php
@@ -87,7 +87,14 @@ public function testBulkControls(int $windowWidth, int $windowHeight, array $con
 
         // Test visibility of search result bulk items and checkbox:
         $shouldBeVisible = $controlVisibility['bulk'];
-        $this->assertEquals($shouldBeVisible, $this->findCss($page, '.bulkActionButtons')->isVisible());
+        $this->assertEquals(
+            $shouldBeVisible,
+            $this->findCss($page, '#search-cart-form .bulkActionButtons')->isVisible()
+        );
+        $this->assertEquals(
+            $shouldBeVisible,
+            $this->findCss($page, '.mainbody > .bulkActionButtons')->isVisible()
+        );
         $this->assertEquals($shouldBeVisible, $this->findCss($page, '.checkbox-select-item')->isVisible());
 
         // Add a favorite:

diff --git a/themes/bootstrap5/css/compiled.css b/themes/bootstrap5/css/compiled.css
diff --git a/themes/bootstrap5/scss/components/search.scss b/themes/bootstrap5/scss/components/search.scss
@@ -47,10 +47,8 @@ $thumbnail-width-large:  160px !default;
   #datevispublishDatexWrapper,
   // Bulk action checkboxes:
   #search-cart-form .result .checkbox,
-  // Search result bulk action buttons:
-  #search-cart-form .bulkActionButtons,
-  // Favorites bulk action buttons:
-  form[name="bulkActionForm"] .bulkActionButtons { display: none; }
+  // Search result and favorites bulk action buttons:
+  .bulkActionButtons { display: none; }
 }
 
 .searchHomeContent { @include clearfix(); }

diff --git a/themes/local_theme_example/css/compiled.css b/themes/local_theme_example/css/compiled.css
diff --git a/themes/sandal5/css/compiled.css b/themes/sandal5/css/compiled.css