blacklight 9.0.0.beta1 → 9.0.0

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-09-03 14:22:19 UTC using RuboCop version 1.66.0.
+# on 2025-07-01 15:50:17 UTC using RuboCop version 1.77.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -12,6 +12,16 @@ Capybara/CurrentPathExpectation:
   Exclude:
     - 'spec/features/alternate_controller_spec.rb'
 
+# Offense count: 7
+Capybara/NegationMatcherAfterVisit:
+  Exclude:
+    - 'spec/features/bookmarks_spec.rb'
+    - 'spec/features/facets_spec.rb'
+    - 'spec/features/modal_spec.rb'
+    - 'spec/features/record_view_spec.rb'
+    - 'spec/features/search_context_spec.rb'
+    - 'spec/features/sitelinks_search_box_spec.rb'
+
 # Offense count: 13
 Capybara/VisibilityMatcher:
   Exclude:
@@ -35,7 +45,7 @@ Lint/AmbiguousOperator:
     - 'spec/models/blacklight/facet_paginator_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
 
-# Offense count: 45
+# Offense count: 43
 # This cop supports safe autocorrection (--autocorrect).
 Lint/AmbiguousRegexpLiteral:
   Exclude:
@@ -45,7 +55,6 @@ Lint/AmbiguousRegexpLiteral:
     - 'spec/helpers/catalog_helper_spec.rb'
     - 'spec/models/record_mailer_spec.rb'
     - 'spec/views/catalog/_document.html.erb_spec.rb'
-    - 'spec/views/catalog/_search_header.erb_spec.rb'
     - 'spec/views/catalog/_sort_and_per_page.html.erb_spec.rb'
     - 'spec/views/catalog/index.html.erb_spec.rb'
     - 'spec/views/catalog/show.html.erb_spec.rb'
@@ -75,13 +84,7 @@ Lint/EmptyBlock:
     - 'app/controllers/concerns/blacklight/bookmarks.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
-# Offense count: 1
-# Configuration parameters: AllowComments.
-Lint/EmptyFile:
-  Exclude:
-    - 'spec/components/blacklight/document_metadata_component_spec.rb'
-
-# Offense count: 48
+# Offense count: 52
 # Configuration parameters: AllowedParentClasses.
 Lint/MissingSuper:
   Enabled: false
@@ -96,15 +99,10 @@ Lint/ParenthesesAsGroupedExpression:
     - 'spec/features/search_spec.rb'
     - 'spec/models/blacklight/solr/repository_spec.rb'
 
-# Offense count: 2
-Lint/ShadowingOuterLocalVariable:
-  Exclude:
-    - 'spec/models/blacklight/configuration_spec.rb'
-
-# Offense count: 83
+# Offense count: 81
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 46
+  Max: 43
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
@@ -112,27 +110,27 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 26
 
-# Offense count: 42
+# Offense count: 37
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 14
+  Max: 13
 
-# Offense count: 78
+# Offense count: 81
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 27
 
-# Offense count: 4
+# Offense count: 3
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 124
+  Max: 115
 
-# Offense count: 8
+# Offense count: 7
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 36
+# Offense count: 30
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 14
@@ -161,7 +159,7 @@ Naming/MethodParameterName:
 # Offense count: 9
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
+# AllowedIdentifiers: TLS1_1, TLS1_2, capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
 Naming/VariableNumber:
   Exclude:
     - 'spec/lib/blacklight/search_state_spec.rb'
@@ -175,13 +173,13 @@ RSpec/BeforeAfterAll:
     - 'spec/models/blacklight/document/dublin_core_spec.rb'
     - 'spec/models/blacklight/solr/document_spec.rb'
 
-# Offense count: 109
+# Offense count: 107
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
-# Offense count: 138
+# Offense count: 143
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 33
@@ -191,7 +189,7 @@ RSpec/ExpectInHook:
   Exclude:
     - 'spec/controllers/catalog_controller_spec.rb'
 
-# Offense count: 108
+# Offense count: 107
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
@@ -205,7 +203,6 @@ RSpec/InstanceVariable:
     - 'spec/models/blacklight/solr/document_spec.rb'
     - 'spec/models/record_mailer_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
-    - 'spec/views/catalog/index.atom.builder_spec.rb'
 
 # Offense count: 4
 RSpec/IteratedExpectation:
@@ -232,7 +229,7 @@ RSpec/MessageChain:
     - 'spec/presenters/blacklight/field_presenter_spec.rb'
     - 'spec/views/shared/_user_util_links.html.erb_spec.rb'
 
-# Offense count: 28
+# Offense count: 27
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
@@ -246,7 +243,7 @@ RSpec/MessageSpies:
     - 'spec/models/blacklight/suggest_search_spec.rb'
     - 'spec/presenters/blacklight/field_presenter_spec.rb'
 
-# Offense count: 390
+# Offense count: 400
 RSpec/MultipleExpectations:
   Max: 16
 
@@ -255,13 +252,13 @@ RSpec/MultipleExpectations:
 RSpec/MultipleMemoizedHelpers:
   Max: 14
 
-# Offense count: 399
+# Offense count: 429
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 60
+# Offense count: 71
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 5
@@ -289,7 +286,7 @@ RSpec/ScatteredLet:
   Exclude:
     - 'spec/views/catalog/index.atom.builder_spec.rb'
 
-# Offense count: 20
+# Offense count: 19
 RSpec/StubbedMock:
   Exclude:
     - 'spec/controllers/catalog_controller_spec.rb'
@@ -328,9 +325,9 @@ Rails/Date:
   Exclude:
     - 'spec/models/search_spec.rb'
 
-# Offense count: 20
+# Offense count: 17
 # Configuration parameters: Include.
-# Include: app/helpers/**/*.rb
+# Include: **/app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
   Exclude:
     - 'app/helpers/blacklight/catalog_helper_behavior.rb'
@@ -351,12 +348,12 @@ Rails/OutputSafety:
   Exclude:
     - 'app/presenters/blacklight/rendering/join.rb'
 
-# Offense count: 14
+# Offense count: 11
 Security/Eval:
   Exclude:
     - 'spec/models/blacklight/solr/response_spec.rb'
 
-# Offense count: 9
+# Offense count: 7
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: prefer_alias, prefer_alias_method
@@ -381,10 +378,12 @@ Style/BlockDelimiters:
     - 'app/views/catalog/index.rss.builder'
     - 'app/views/catalog/opensearch.xml.builder'
 
-# Offense count: 52
+# Offense count: 57
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
 # SupportedStyles: nested, compact
+# SupportedStylesForClasses: ~, nested, compact
+# SupportedStylesForModules: ~, nested, compact
 Style/ClassAndModuleChildren:
   Enabled: false
 
@@ -409,7 +408,7 @@ Style/DocumentDynamicEvalDefinition:
     - 'app/builders/blacklight/action_builder.rb'
     - 'lib/blacklight/configuration/fields.rb'
 
-# Offense count: 133
+# Offense count: 144
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
@@ -428,9 +427,9 @@ Style/ExpandPathArguments:
     - 'lib/generators/blacklight/test_support_generator.rb'
     - 'lib/generators/blacklight/user_generator.rb'
 
-# Offense count: 16
+# Offense count: 17
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
+# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, Mode, AllowedMethods, AllowedPatterns.
 # SupportedStyles: annotated, template, unannotated
 # AllowedMethods: redirect
 Style/FormatStringToken:
@@ -447,18 +446,17 @@ Style/GuardClause:
     - 'app/helpers/blacklight/catalog_helper_behavior.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
-# Offense count: 29
+# Offense count: 32
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Enabled: false
 
-# Offense count: 6
+# Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 Style/MultilineIfModifier:
   Exclude:
     - 'app/views/catalog/index.atom.builder'
     - 'lib/blacklight/solr/response/facets.rb'
-    - 'lib/blacklight/solr/search_builder_behavior.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -467,15 +465,7 @@ Style/MultipleComparison:
   Exclude:
     - 'lib/blacklight/configuration/context.rb'
 
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
-  Exclude:
-    - 'lib/blacklight/solr/request.rb'
-
-# Offense count: 9
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
@@ -507,13 +497,12 @@ Style/ParenthesesAroundCondition:
   Exclude:
     - 'app/views/catalog/_document.atom.builder'
 
-# Offense count: 3
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Exclude:
     - 'lib/blacklight/engine.rb'
-    - 'lib/blacklight/solr/request.rb'
 
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
@@ -532,20 +521,6 @@ Style/RescueStandardError:
     - 'lib/blacklight/configuration/fields.rb'
     - 'lib/railties/blacklight.rake'
 
-# Offense count: 11
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
-# AllowedMethods: present?, blank?, presence, try, try!
-Style/SafeNavigation:
-  Exclude:
-    - 'app/controllers/concerns/blacklight/bookmarks.rb'
-    - 'app/controllers/concerns/blacklight/controller.rb'
-    - 'app/services/blacklight/field_retriever.rb'
-    - 'lib/blacklight.rb'
-    - 'lib/blacklight/configuration/facet_field.rb'
-    - 'lib/blacklight/configuration/search_field.rb'
-    - 'lib/blacklight/solr/search_builder_behavior.rb'
-
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowAsExpressionSeparator.

data/.solr_wrapper.yml

@@ -1,5 +1,7 @@
 # Place any default configuration for solr_wrapper here
 # port: 8983
+env:
+  SOLR_MODULES: analysis-extras
 collection:
-  dir: lib/generators/blacklight/templates/solr/conf
+  dir: lib/generators/blacklight/templates/solr/
   name: blacklight-core

data/README.md

@@ -48,8 +48,8 @@ Blacklight assumes a modern browser with support for [Baseline 2023](https://web
 
 ## Dependencies
 
-* [Ruby](https://www.ruby-lang.org/) 3.1+
-* [Ruby on Rails](https://rubyonrails.org/) 6.1+
+* [Ruby](https://www.ruby-lang.org/) 3.2+
+* [Ruby on Rails](https://rubyonrails.org/) 7.2+
 
 Blacklight aims to support the currently [supported versions of Ruby](https://www.ruby-lang.org/en/downloads/branches/) and the [supported versions of Ruby on Rails](https://guides.rubyonrails.org/maintenance_policy.html).  We aim to keep our [test configuration](blob/main/.github/workflows/ruby.yml) up to date with these supported versions.
 

data/VERSION

@@ -1 +1 @@
-9.0.0.beta1
+9.0.0

data/app/assets/builds/blacklight.css

@@ -18,6 +18,8 @@
   --bl-constraint-remove-hover-bg: #bb2d3b;
   --bl-constraint-remove-hover-border-color: #bb2d3b;
   --bl-field-name-color: var(--bs-secondary-color);
+  /* emulate Bootstrap backdrop bg & opacity */
+  --bl-modal-backdrop-bg: rgba(0, 0, 0, 0.5);
 }
 
 .page-link {
@@ -31,6 +33,9 @@ dialog.modal[open] {
   max-height: unset;
   max-width: unset;
 }
+dialog.modal[open]::backdrop {
+  background-color: var(--bl-modal-backdrop-bg);
+}
 
 /* Generic layout stuff */
 main {
@@ -40,6 +45,10 @@ main {
 /*
   Header bar at top (Bootstrap nav-bar)
 */
+.navbar.bg-dark {
+  --bs-emphasis-color-rgb: 255, 255, 255;
+}
+
 .navbar-logo {
   /* The main logo image for the Blacklight instance */
   background: transparent var(--bl-logo-image) no-repeat top left;
@@ -180,10 +189,8 @@ main {
   padding-left: 0;
 }
 
-@media (max-width: 575.98px) {
-  .pagination {
-    flex-wrap: wrap;
-  }
+.pagination {
+  flex-wrap: wrap;
 }
 
 .group-key {
@@ -246,25 +253,27 @@ main {
   }
 }
 
-.sidenav {
+.facets {
   --bl-facet-active-bg: var(--bs-success);
+  --bl-facet-active-color: var(--bs-white);
   --bl-facet-active-item-color: var(--bs-success);
   --bl-facet-remove-color: var(--bs-secondary-color);
   --bl-facet-remove-hover-color: var(--bs-danger);
   --bl-facet-label-indent: -15px;
   --bl-facet-label-padding-left: 15px;
   --bl-facet-header-padding-y: 0.5rem;
+  --bl-facet-value-padding-y: 0.2rem;
 }
-.sidenav .facet-toggle-button [data-hide-label] {
+.facets .facet-toggle-button [data-hide-label] {
   display: inline;
 }
-.sidenav .facet-toggle-button [data-show-label] {
+.facets .facet-toggle-button [data-show-label] {
   display: none;
 }
-.sidenav .facet-toggle-button[aria-expanded=false] [data-hide-label] {
+.facets .facet-toggle-button[aria-expanded=false] [data-hide-label] {
   display: none;
 }
-.sidenav .facet-toggle-button[aria-expanded=false] [data-show-label] {
+.facets .facet-toggle-button[aria-expanded=false] [data-show-label] {
   display: inline;
 }
 
@@ -298,16 +307,21 @@ main {
 
 .facet-limit {
   --bs-accordion-btn-bg: var(--bs-gray-100);
-  --bs-btn-hover-bg: var(--bs-gray-200);
+  --bs-btn-active-bg: var(--bs-accordion-btn-bg);
+  --bs-btn-hover-bg: var(--bs-accordion-btn-bg);
   --bs-accordion-active-bg: var(--bs-accordion-btn-bg);
 }
 
 .facet-limit-active {
   --bs-accordion-btn-bg: var(--bl-facet-active-bg);
   --bs-btn-hover-bg: var(--bs-accordion-btn-bg);
-  --bs-accordion-btn-color: var(--bs-light);
+  --bs-btn-active-bg: var(--bl-facet-active-bg);
+  --bs-btn-active-color: var(--bl-facet-active-color);
+  --bs-accordion-btn-color: var(--bl-facet-active-color);
   --bs-btn-hover-color: var(--bs-accordion-btn-color);
   --bs-accordion-active-color: var(--bs-accordion-btn-color);
+  --bs-accordion-btn-icon: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='white' stroke-linecap='round' stroke-linejoin='round'><path d='m2 5 6 6 6-6'/></svg>");
+  --bs-accordion-btn-active-icon: var(--bs-accordion-btn-icon);
 }
 
 .facet-values {
@@ -319,7 +333,7 @@ main {
 .facet-values li {
   display: flex;
   align-items: flex-start;
-  padding: 3px 0;
+  padding-block: var(--bl-facet-value-padding-y);
 }
 .facet-values li.treeitem {
   display: block;
@@ -330,7 +344,6 @@ main {
 .facet-values .remove {
   color: var(--bl-facet-remove-color);
   font-weight: bold;
-  padding-left: 0.5rem;
   text-decoration: none;
 }
 .facet-values .remove:hover {
@@ -366,20 +379,29 @@ main {
   color: inherit;
 }
 
-/* Sidenav
+/* Pivot Facets
 -------------------------------------------------- */
-.pivot-facet.show {
-  display: flex;
+.pivot-facet {
+  --bl-facet-toggle-width: 1em;
+  --bl-facet-toggle-height: var(--bl-facet-toggle-width);
+  --bl-facet-toggle-margin: 0.5em;
+  --bl-facet-toggle-show-icon: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus-square" viewBox="0 0 16 16"><path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z" /><path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z" /></svg>');
+  --bl-facet-toggle-hide-icon: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-dash-square" viewBox="0 0 16 16"><path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z" /><path d="M4 8a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7A.5.5 0 0 1 4 8z" /></svg>');
+}
+.pivot-facet li.treeitem:not(:has(button.facet-toggle-handle)) {
+  margin-left: calc(var(--bl-facet-toggle-width) + var(--bl-facet-toggle-margin));
 }
 
 .facet-toggle-handle {
+  --bs-btn-hover-bg: var(--bs-btn-hover-bg);
+  --bs-btn-active-bg: var(--bs-btn-active-bg);
   margin-block: 0;
   padding-block: 0;
-  padding-inline: 0.5rem;
-  margin-inline-start: -0.75rem;
-}
-.pivot-facet .facet-toggle-handle {
-  margin-inline-start: -1.5rem;
+  padding: 0;
+  border: 0;
+  width: var(--bl-facet-toggle-width);
+  height: var(--bl-facet-toggle-height);
+  margin-right: var(--bl-facet-toggle-margin);
 }
 .facet-toggle-handle.collapsed .show {
   display: flex;
@@ -395,24 +417,20 @@ main {
 }
 .facet-toggle-handle .show .icon,
 .facet-toggle-handle .hide .icon {
-  width: 1em;
-  height: 1em;
-  padding: 0.375rem 0.75rem;
+  width: var(--bl-facet-toggle-width);
+  height: var(--bl-facet-toggle-height);
 }
 .facet-toggle-handle .show .icon {
-  background: transparent url('data:image/svg+xml,%3csvg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus-square" viewBox="0 0 16 16"%3e%3cpath d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z" /%3e%3cpath d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z" /%3e%3c/svg%3e') center/1em auto no-repeat;
+  background: transparent var(--bl-facet-toggle-show-icon) center/var(--bl-facet-toggle-width) auto no-repeat;
 }
 .facet-toggle-handle .hide .icon {
-  background: transparent url('data:image/svg+xml,%3csvg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-dash-square" viewBox="0 0 16 16"%3e%3cpath d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z" /%3e%3cpath d="M4 8a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7A.5.5 0 0 1 4 8z" /%3e%3c/svg%3e') center/1em auto no-repeat;
+  background: transparent var(--bl-facet-toggle-hide-icon) center/var(--bl-facet-toggle-width) auto no-repeat;
 }
 
 /* Search History */
 .search-history {
   --bl-history-filter-name-color: var(--bs-secondary-color);
 }
-.search-history td {
-  padding: 1rem;
-}
 .search-history .constraint {
   padding-inline-end: 1rem;
   display: block;
@@ -425,24 +443,19 @@ main {
   border-radius: 5px;
 }
 
-.modal-content .facet-pagination.top {
-  display: none; /* Doesn't display in a modal, but would display on a new page (e.g. without Javascript) */
-}
 .modal-content .page-sidebar {
   display: none;
 }
 .modal-content .blacklight-modal-close {
   display: block;
 }
-.modal-content .prev_next_links.btn-group .btn {
-  border: 0;
-}
 
 .blacklight-modal-close {
   display: none;
 }
 
-.remove .bi {
-  height: 1em;
-  width: 1em;
+.modal-footer:not(.modal .modal-footer) {
+  border-top: var(--bs-border-width) solid var(--bs-border-color);
+  padding-top: 1rem;
+  margin-top: 1rem;
 }