Fix 'basic theme' Appearance customization colors

Gemfile

@@ -30,7 +30,7 @@ gem 'blacklight_range_limit'
 gem 'bolognese', '>= 1.9.10'
 gem 'bootstrap', '~> 4.6'
 gem 'bootstrap-datepicker-rails'
-gem 'bulkrax', '8.3.0', github: 'samvera-labs/bulkrax', tag: 'v8.3.0'
+gem 'bulkrax', '~> 8.3'
 gem 'byebug', group: %i[development test]
 gem 'capybara', group: %i[test]
 gem 'capybara-screenshot', '~> 1.0', group: %i[test]

Gemfile.lock

@@ -88,28 +88,6 @@ GIT
       rake (>= 12.2)
       thor (~> 1.0)
 
-GIT
-  remote: https://github.com/samvera-labs/bulkrax.git
-  revision: 562ca9ce898d47e5377679c525f2e2c13c7d9959
-  tag: v8.3.0
-  specs:
-    bulkrax (8.3.0)
-      bagit (~> 0.4.6)
-      coderay
-      denormalize_fields
-      iso8601 (~> 0.9.0)
-      kaminari
-      language_list (~> 1.2, >= 1.2.1)
-      libxml-ruby (~> 5.0)
-      loofah (>= 2.2.3)
-      marcel
-      oai (>= 0.4, < 2.x)
-      rack (>= 2.0.6)
-      rails (>= 5.1.6)
-      rdf (>= 2.0.2, < 4.0)
-      rubyzip
-      simple_form
-
 GIT
   remote: https://github.com/samvera-labs/hyku_knapsack.git
   revision: 5a7c54cace96881a3963ab2fd881ca6ea3f57372
@@ -418,6 +396,22 @@ GEM
       signet (~> 0.8)
       typhoeus
     builder (3.2.4)
+    bulkrax (8.3.0)
+      bagit (~> 0.4.6)
+      coderay
+      denormalize_fields
+      iso8601 (~> 0.9.0)
+      kaminari
+      language_list (~> 1.2, >= 1.2.1)
+      libxml-ruby (~> 5.0)
+      loofah (>= 2.2.3)
+      marcel
+      oai (>= 0.4, < 2.x)
+      rack (>= 2.0.6)
+      rails (>= 5.1.6)
+      rdf (>= 2.0.2, < 4.0)
+      rubyzip
+      simple_form
     byebug (11.1.3)
     cancancan (3.6.1)
     capybara (3.39.2)
@@ -1500,7 +1494,7 @@ DEPENDENCIES
   bolognese (>= 1.9.10)
   bootstrap (~> 4.6)
   bootstrap-datepicker-rails
-  bulkrax (= 8.3.0)!
+  bulkrax (~> 8.3)
   byebug
   capybara
   capybara-screenshot (~> 1.0)

app/assets/javascripts/application.js

@@ -27,7 +27,6 @@
 //= require tether
 // Required by Blacklight
 //= require blacklight/blacklight
-//= require admin_color_select
 //= require blacklight_advanced_search
 //= require blacklight_gallery/default
 

app/assets/javascripts/hyku/admin/appearance/colors.js

@@ -9,7 +9,7 @@ $(document).on('turbolinks:load', function() {
     input.val(input.data('default-value'));
   });
 
-  $('.panel-footer a.restore-all-default-colors').click(function(e) {
+  $('.card-footer a.restore-all-default-colors').click(function(e) {
     e.preventDefault();
 
     var allColorInputs = $("input[name*='color']");

app/assets/javascripts/hyku/admin/appearance/default_images.js

@@ -1,6 +1,6 @@
 // Default Images form
 $(document).on('turbolinks:load', function() {
-  $('#default_images .panel-footer input[name="commit"]').click(function(e) {
+  $('#default_images .card-footer input[name="commit"]').click(function(e) {
     // Prevent ActionController::ParameterMissing error by not
     // allowing a blank form to be submit. Blank inputs are allowed,
     // as long as at least one input has a value.

app/assets/javascripts/hyku/admin/appearance/fonts.js

@@ -17,7 +17,7 @@ Blacklight.onLoad(function() {
     inputDisplay.text(defaultValue);
   });
 
-  $('.panel-footer a.restore-all-default-fonts').click(function(e) {
+  $('.card-footer a.restore-all-default-fonts').click(function(e) {
     e.preventDefault();
 
     var allFontInputs = $("input[name*='font']");

app/assets/stylesheets/hyku.scss

@@ -78,6 +78,12 @@
   }
 }
 
+// active hightlight on sort/per page on catalog page
+.dropdown-item:active,
+.dropdown-item.active {
+  background-color: #9bafbf;
+}
+
 footer.navbar {
   border-radius: 0;
   font-size: 0.9em;
@@ -363,7 +369,7 @@ a.restore-default-color {
   margin-bottom: 2em;
 }
 
-a.btn.btn-default.restore-default-color.with-color-hint {
+a.btn.btn-secondary.restore-default-color.with-color-hint {
   margin-top: 4em;
 }
 
@@ -387,7 +393,7 @@ a.btn.btn-default.restore-default-color.with-color-hint {
   }
 }
 
-#default_images .panel-footer form {
+#default_images .card-footer form {
   display: inline-block;
 }
 
@@ -441,11 +447,13 @@ div#collapse-citations {
 body.public-facing {
   .btn {
     &.btn-primary,
-    &.btn-secondary,
-    &.btn-danger {
+    &.btn-secondary {
       color: #fff;
     }
 
+    &.btn-danger {
+      color: #fff !important;
+    }
     &.btn-primary {
       background-color: #337ab7;
     }
@@ -502,10 +510,6 @@ body.public-facing {
   width: unset;
 }
 
-// .featured-collection-section {
-//   border: 1px solid #ccc;
-// }
-
 .mb-30 {
   margin-bottom: 30px;
 }
@@ -561,11 +565,6 @@ span.constraint-value p, .facet-values p {
   margin: 10px 0 10px 0;
 }
 
-.catalog_startOverLink {
-  font-size: 1.15em;
-  font-weight: bold;
-}
-
 // collection show page styles
 
 .space-between {
@@ -579,15 +578,6 @@ span.constraint-value p, .facet-values p {
   .hyc-bugs .hyc-last-updated,
   .hyc-title {
     padding: 0;
-
-    h1 {
-      color: #000;
-    }
-  }
-
-  .hyc-created-by,
-  .hyc-last-updated {
-    color: #000 !important;
   }
 
   .hyc-item-count {
@@ -721,4 +711,96 @@ tr[data-feature="use-iiif-print"] {
 .slideshow-info {
   text-align: center;
   margin-bottom: 15px;
-}
+}
+
+/* Collection show page */
+
+// nav search header
+#search-form-header {
+  // adds bootstrap class to element
+  label[for="search-field-header"] {
+    @extend .sr-only;
+  }
+
+  .form-group {
+    justify-content: right;
+  }
+}
+
+.hyc-bugs {
+  margin-top: 10px;
+}
+
+.hyc-bl-results {
+  margin: 2em 0 2em;
+}
+
+.hyrax-collections-show {
+  .document-metadata {
+    dd {
+      word-break: break-all;
+    }
+  }
+
+  table.table-striped {
+    th {
+      &:not(:nth-child(1)):not(:nth-child(2)) {
+        text-align: center;
+      }
+      border-top: none;
+    }
+  }
+}
+
+dd {
+  /* margin-bottom: .5rem; */
+  margin-left: 0;
+  margin-bottom: 0;
+}
+
+// collections gallery view
+#documents {
+
+  // hide the bookmark button
+  .caption-area {
+    input[name="commit"] {
+      display: none;
+    }
+  }
+
+  .document {
+    margin-top: 6px;
+    padding-top: 6px;
+
+    .document-thumbnail {
+      .img-thumbnail {
+        padding: 0.25rem;
+        background-color: #fff;
+        border: 1px solid #dee2e6;
+        border-radius: 0.25rem;
+      }
+    }
+  }
+}
+
+// adds bootstrap class to element
+.documents-gallery {
+  @extend .row-cols-lg-4;
+}
+
+// pagination
+.hyc-bl-pager {
+  .pagination {
+    display: flex;
+  }
+}
+
+@media (max-width: 768px) {
+  .hyc-banner {
+    .hyc-bugs {
+      flex-wrap: wrap;
+    }
+  }
+}
+/* End Collection show page */
+