Merge pull request #3370 from projectblacklight/drop-bootstrap4

Drop support of Bootstrap 4

.github/workflows/ruby.yml

@@ -13,36 +13,18 @@ jobs:
       matrix:
         rails_version: ["~> 7.2"]
         ruby: ["3.2", "3.3"]
-        bootstrap_version: ["~> 4.0"]
+        bootstrap_version: ["~> 5.0"]
         blacklight_version: ["~> 8.0"]
         additional_engine_cart_rails_options: ["-a propshaft -j importmap"]
         additional_name: [""]
         include:
           - rails_version: "~> 8.0"
             ruby: "3.3"
             blacklight_version: "~> 8.0"
-            bootstrap_version: "~> 5.0"
             additional_name: Rails 8
           - rails_version: "~> 7.2"
             ruby: "3.3"
             blacklight_version: "~> 8.0"
-            bootstrap_version: "~> 5.0"
-            additional_name: Bootstrap 5
-          - rails_version: "7.1.4"
-            ruby: "3.2"
-            blacklight_version: "~> 8.0"
-            bootstrap_version: "~> 4.0"
-            additional_name: Rails 7.1
-          - rails_version: "~> 7.1.4"
-            ruby: "3.2"
-            blacklight_version: "~> 8.0"
-            bootstrap_version: "~> 4.0"
-            additional_engine_cart_rails_options: "-a propshaft -j esbuild"
-            additional_name: "JS bundling (esbuild) Bootstrap 4"
-          - rails_version: "~> 7.2"
-            ruby: "3.3"
-            blacklight_version: "~> 8.0"
-            bootstrap_version: "~> 5.0"
             additional_engine_cart_rails_options: "-a propshaft -j esbuild"
             additional_name: "JS bundling (esbuild) Bootstrap 5"
     env:

app/assets/stylesheets/spotlight/_catalog.scss

@@ -4,7 +4,6 @@
   .thumbnail-column {
     box-sizing: content-box;
     min-width: 60px;
-
   }
 
   .document-thumbnail {
@@ -20,7 +19,9 @@
     object-fit: cover;
   }
 
-  .document-counter {display: none;}
+  .document-counter {
+    display: none;
+  }
 
   .index_title {
     margin-top: 0;
@@ -43,18 +44,23 @@
     text-align: center;
     li {
       @extend .badge;
-      @extend .badge-secondary !optional;
-      @extend .bg-secondary !optional;
+      @extend .bg-secondary;
       a {
         color: #fff;
       }
     }
   }
 }
 
-.document, tr.doc-row, li.dd-item, .autocomplete-item {
+.document,
+tr.doc-row,
+li.dd-item,
+.autocomplete-item {
   &.blacklight-private {
-    .index_title, h1, .card-title, .autocomplete-title {
+    .index_title,
+    h1,
+    .card-title,
+    .autocomplete-title {
       @include private-label;
     }
   }
@@ -99,12 +105,14 @@ form.edit_solr_document {
   }
 }
 
-.blacklight-catalog-edit, .blacklight-catalog-show {
+.blacklight-catalog-edit,
+.blacklight-catalog-show {
   .img-thumbnail {
     @extend .col-md-6;
   }
 
-  .tags, .dl-horizontal {
+  .tags,
+  .dl-horizontal {
     @extend .col-md-6;
   }
 
@@ -127,7 +135,8 @@ form.edit_solr_document {
   width: 60%;
   margin-left: -1 * $spacer * 0.1;
 
-  .btn, .btn-group {
+  .btn,
+  .btn-group {
     margin-left: $spacer * 0.1;
     margin-top: $spacer * 0.25;
   }
@@ -148,28 +157,26 @@ form.edit_solr_document {
 .document {
   .blacklight-exhibit_tags a {
     @extend .badge;
-    @extend .badge-secondary !optional;
-    @extend .bg-secondary !optional;
+    @extend .bg-secondary;
 
     &:not(:last-child) {
-      @extend .mr-2 !optional;
-      @extend .me-2 !optional;
+      @extend .me-2;
     }
   }
 }
 
 .visibility-toggle {
-	.no-js & {
-		input[type="submit"] {
-			display: inline
-		}
-
-		div.toggle-visibility {
-			display: none
-		}
-	}
-
-	input[type="submit"] {
-		display: none;
-	}
+  .no-js & {
+    input[type="submit"] {
+      display: inline;
+    }
+
+    div.toggle-visibility {
+      display: none;
+    }
+  }
+
+  input[type="submit"] {
+    display: none;
+  }
 }

app/assets/stylesheets/spotlight/_mixins.scss

@@ -1,5 +1,5 @@
 @mixin edit-in-place-highlighting() {
-  background: #F7F7D0;
+  background: #f7f7d0;
   cursor: text;
 }
 
@@ -10,9 +10,8 @@
 @mixin private-label() {
   &:after {
     @extend .badge;
-    @extend .badge-warning !optional;
-    @extend .bg-warning !optional;
-    content: 'Private';
+    @extend .bg-warning;
+    content: "Private";
     margin-left: 3px;
     color: black;
   }