blacklight-spotlight 3.5.0.2 → 3.6.0.beta1

data/vendor/assets/stylesheets/sir-trevor/_variables.scss

@@ -1,22 +1,20 @@
-// Adjusted from upstream to use bootstrap's colors.
+$text-block-font-size: 1.275em !default;
 
-$text-block-font-size: 1.275em;
-$text-color: $body-color;
-$text-block-font-color: $text-color;
-$accent-color: theme-color("primary");
-$base-ui-color: theme-color("secondary");
-$light-ui-color: $gray-400;
-$blocks-control-bg-color: $card-cap-bg;
-$blocks-control-border-color: $card-border-color;
-$error-color: theme-color("danger");
-$selection-color: #B4D5FE;
+$text-block-font-color: #282d31 !default;
+$accent-color: #17bb75 !default;
+$base-ui-color: #42474b !default;
+$light-ui-color: #ccc !default;
+$blocks-control-bg-color: #f7f7f7 !default;
+$blocks-control-border-color: #ddd !default;
+$error-color: #d70014 !default;
+$selection-color: #b1f2d6 !default;
 
-$inner-block-padding: $grid-gutter-width $grid-gutter-width $grid-gutter-width + 18px $grid-gutter-width;
+$inner-block-padding: 30px 30px 48px !default;
 
-$block-controls-height: 164px;
-$block-add-height: $line-height-lg * 2;
-$block-controls-color:#9B9B9B;
+$block-controls-height: 164px !default;
+$block-add-height: 40px !default;
+$block-controls-color: #9b9b9b !default;
 
-$border-size: 2px;
-$border-style: solid;
-$default-border: $border-size $border-style $accent-color;
+$border-size: 2px !default;
+$border-style: solid !default;
+$default-border: $border-size $border-style $accent-color !default;

data/vendor/assets/stylesheets/sir-trevor/base.scss

@@ -11,6 +11,17 @@
   fill: currentColor;
 }
 
+.st-block__inner {
+  ::-moz-selection {
+    background: $selection-color;
+    text-shadow: none;
+  }
+  ::selection {
+    background: $selection-color;
+    text-shadow: none;
+  }
+}
+
 .st-spinner {
   position: absolute!important;
   left: 50%; top: 50%;

data/vendor/assets/stylesheets/sir-trevor/block-addition-top.scss

@@ -10,7 +10,7 @@
   position: relative;
   cursor: text;
   display: none;
-  
+
   &::-moz-focus-inner {
     padding:0;
     margin:0;
@@ -86,6 +86,9 @@
 }
 
 .st-block-addition-top__button {
+  background: none;
+  border:none;
+  outline:none;
   position: absolute;
   top: 0;
   left: 76px;

data/vendor/assets/stylesheets/sir-trevor/block-addition.scss

@@ -16,7 +16,7 @@ $animation-speed: 0.2s;
   background-color:transparent;
   padding:0;
   z-index: 2;
-  
+
   &::-moz-focus-inner {
     padding:0;
     margin:0;
@@ -24,7 +24,8 @@ $animation-speed: 0.2s;
   }
 
   .st-top-controls &,
-  .st-block:last-child:not(.st-block--empty):not(.st-block--textable) & {
+  .st-block:last-child:not(.st-block--empty):not(.st-block--textable) &,
+  .st-block[data-type="quote"]:last-child & {
     display: block;
   }
 }

data/vendor/assets/stylesheets/sir-trevor/block-controls.scss

@@ -32,3 +32,7 @@
   width: 42px;
   height: 42px;
 }
+
+.st-block-controls__button:hover {
+  color: $accent-color;
+}

data/vendor/assets/stylesheets/sir-trevor/block-ui.scss

@@ -26,6 +26,16 @@
   width: 1em;
   height: 1em;
   color:$block-controls-color;
+
+  &:before {
+    position: absolute;
+    display: block;
+    content: "";
+    top: -10px;
+    right: -10px;
+    bottom: -10px;
+    left: -10px;
+  }
 }
 
 .st-block-ui-btn__reorder {

data/vendor/assets/stylesheets/sir-trevor/block.scss

@@ -10,8 +10,8 @@
 .st-block__inner {
   position: relative;
   margin: 0 110px;
-  margin-top: 1em;
-  margin-bottom: 1em;
+  margin-top: 1rem;
+  margin-bottom: 1rem;
 
   .st-block--textable & {
     margin-top: 0;
@@ -138,6 +138,7 @@
 .st-text-block p {
   // display: inline;
   // margin: 0;
+  margin: 1rem 0;
   vertical-align: 14%;
 }
 
@@ -146,7 +147,7 @@
   font-size: 1.5em;
   min-height: 1em;
   font-weight: 700;
-  margin: 0.58em 0;
+  margin: 1rem 0;
   overflow: visible;
 }
 
@@ -156,7 +157,7 @@
 
 .st-text-block--quote {
   font-size: 1.875em;
-  line-height: 1.3;
+  line-height: 1.45;
   margin-bottom: 1.8em;
 }
 
@@ -172,7 +173,7 @@ ul.st-text-block {
 
 .st-list-block__editor {
   width: 100%;
-  line-height: 1.8em;
+  line-height: 1.45;
 }
 
 .st-block__inputs {
@@ -298,3 +299,16 @@ ul.st-text-block {
 .st-msg--error {
   color: $error-color;
 }
+
+.st-block--is-selected {
+  &:before {
+    display: block;
+    content: "";
+    background: #ccffcc;
+    position: absolute;
+    top: -6px;
+    left: 100px;
+    right: 20px;
+    bottom: -6px;
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 3.5.0.2
+  version: 3.6.0.beta1
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -65,16 +65,22 @@ dependencies:
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.18'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.18'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: blacklight-gallery
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +220,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -233,26 +239,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 5.4.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 5.4.1
+        version: '5.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 5.4.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 5.4.1
+        version: '5.5'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
@@ -569,42 +563,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: sprockets-es6
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: tophat
   requirement: !ruby/object:Gem::Requirement
@@ -620,19 +586,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: underscore-rails
+  name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -909,6 +875,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/config/spotlight/manifest.js
 - app/assets/images/blacklight/arrow-alt-circle-left.svg
 - app/assets/images/blacklight/arrow-alt-circle-right.svg
 - app/assets/images/blacklight/arrow_back_ios.svg
@@ -928,64 +895,11 @@ files:
 - app/assets/images/spotlight/default_browse_thumbnail.jpg
 - app/assets/images/spotlight/default_thumbnail.jpg
 - app/assets/images/spotlight/fallback/default.png
-- app/assets/javascripts/spotlight/admin/add_another.js
-- app/assets/javascripts/spotlight/admin/add_new_button.js
-- app/assets/javascripts/spotlight/admin/appearance.js
-- app/assets/javascripts/spotlight/admin/attachments.js
-- app/assets/javascripts/spotlight/admin/blacklight_configuration.js
-- app/assets/javascripts/spotlight/admin/block_mixins/autocompleteable.js
-- app/assets/javascripts/spotlight/admin/block_mixins/formable.js
-- app/assets/javascripts/spotlight/admin/block_mixins/plustextable.js
-- app/assets/javascripts/spotlight/admin/blocks/block.js
-- app/assets/javascripts/spotlight/admin/blocks/browse_block.js
-- app/assets/javascripts/spotlight/admin/blocks/browse_group_categories_block.js
-- app/assets/javascripts/spotlight/admin/blocks/iframe_block.js
-- app/assets/javascripts/spotlight/admin/blocks/link_to_search_block.js
-- app/assets/javascripts/spotlight/admin/blocks/oembed_block.js
-- app/assets/javascripts/spotlight/admin/blocks/pages_block.js
-- app/assets/javascripts/spotlight/admin/blocks/resources_block.js
-- app/assets/javascripts/spotlight/admin/blocks/rule_block.js
-- app/assets/javascripts/spotlight/admin/blocks/search_result_block.js
-- app/assets/javascripts/spotlight/admin/blocks/solr_documents_base_block.js
-- app/assets/javascripts/spotlight/admin/blocks/solr_documents_block.js
-- app/assets/javascripts/spotlight/admin/blocks/solr_documents_carousel_block.js
-- app/assets/javascripts/spotlight/admin/blocks/solr_documents_embed_block.js
-- app/assets/javascripts/spotlight/admin/blocks/solr_documents_features_block.js
-- app/assets/javascripts/spotlight/admin/blocks/solr_documents_grid_block.js
-- app/assets/javascripts/spotlight/admin/blocks/uploaded_items_block.js
-- app/assets/javascripts/spotlight/admin/catalog_edit.js
-- app/assets/javascripts/spotlight/admin/copy_email_addresses.js
-- app/assets/javascripts/spotlight/admin/crop.es6
-- app/assets/javascripts/spotlight/admin/croppable.js
-- app/assets/javascripts/spotlight/admin/edit_in_place.js
-- app/assets/javascripts/spotlight/admin/exhibit_tag_autocomplete.js
-- app/assets/javascripts/spotlight/admin/exhibits.js
-- app/assets/javascripts/spotlight/admin/form_observer.js
-- app/assets/javascripts/spotlight/admin/iiif.es6
-- app/assets/javascripts/spotlight/admin/index.js
-- app/assets/javascripts/spotlight/admin/locks.js
-- app/assets/javascripts/spotlight/admin/multi_image_selector.js
-- app/assets/javascripts/spotlight/admin/pages.js.erb
-- app/assets/javascripts/spotlight/admin/progress_monitor.js
-- app/assets/javascripts/spotlight/admin/readonly_checkbox.js
-- app/assets/javascripts/spotlight/admin/search_typeahead.js
-- app/assets/javascripts/spotlight/admin/select_related_input.js
-- app/assets/javascripts/spotlight/admin/sir-trevor/block_controls.js
-- app/assets/javascripts/spotlight/admin/sir-trevor/block_limits.js
-- app/assets/javascripts/spotlight/admin/sir-trevor/locales.js
-- app/assets/javascripts/spotlight/admin/spotlight_nestable.js
-- app/assets/javascripts/spotlight/admin/tabs.js
-- app/assets/javascripts/spotlight/admin/translation_progress.js
-- app/assets/javascripts/spotlight/admin/users.js
 - app/assets/javascripts/spotlight/application.js
+- app/assets/javascripts/spotlight/spotlight.esm.js
+- app/assets/javascripts/spotlight/spotlight.esm.js.map
 - app/assets/javascripts/spotlight/spotlight.js
-- app/assets/javascripts/spotlight/user/analytics.js
-- app/assets/javascripts/spotlight/user/browse_group_categories.js
-- app/assets/javascripts/spotlight/user/carousel.js
-- app/assets/javascripts/spotlight/user/clear_form_button.js
-- app/assets/javascripts/spotlight/user/index.js
-- app/assets/javascripts/spotlight/user/report_a_problem.js
-- app/assets/javascripts/spotlight/user/zpr_links.js.erb
+- app/assets/javascripts/spotlight/spotlight.js.map
 - app/assets/stylesheets/spotlight/_accessibility.scss
 - app/assets/stylesheets/spotlight/_attachments.css
 - app/assets/stylesheets/spotlight/_blacklight_configuration.scss
@@ -1089,6 +1003,65 @@ files:
 - app/helpers/spotlight/searches_helper.rb
 - app/helpers/spotlight/title_helper.rb
 - app/helpers/spotlight/translations_helper.rb
+- app/javascript/spotlight/admin/add_another.es6
+- app/javascript/spotlight/admin/add_image_selector.es6
+- app/javascript/spotlight/admin/add_new_button.es6
+- app/javascript/spotlight/admin/appearance.es6
+- app/javascript/spotlight/admin/blacklight_configuration.es6
+- app/javascript/spotlight/admin/block_mixins/autocompleteable.js
+- app/javascript/spotlight/admin/block_mixins/formable.js
+- app/javascript/spotlight/admin/block_mixins/plustextable.js
+- app/javascript/spotlight/admin/blocks/block.js
+- app/javascript/spotlight/admin/blocks/browse_block.js
+- app/javascript/spotlight/admin/blocks/browse_group_categories_block.js
+- app/javascript/spotlight/admin/blocks/iframe_block.js
+- app/javascript/spotlight/admin/blocks/link_to_search_block.js
+- app/javascript/spotlight/admin/blocks/oembed_block.js
+- app/javascript/spotlight/admin/blocks/pages_block.js
+- app/javascript/spotlight/admin/blocks/resources_block.js
+- app/javascript/spotlight/admin/blocks/rule_block.js
+- app/javascript/spotlight/admin/blocks/search_result_block.js
+- app/javascript/spotlight/admin/blocks/solr_documents_base_block.js
+- app/javascript/spotlight/admin/blocks/solr_documents_block.js
+- app/javascript/spotlight/admin/blocks/solr_documents_carousel_block.js
+- app/javascript/spotlight/admin/blocks/solr_documents_embed_block.js
+- app/javascript/spotlight/admin/blocks/solr_documents_features_block.js
+- app/javascript/spotlight/admin/blocks/solr_documents_grid_block.js
+- app/javascript/spotlight/admin/blocks/uploaded_items_block.js
+- app/javascript/spotlight/admin/checkbox_submit.es6
+- app/javascript/spotlight/admin/copy_email_addresses.es6
+- app/javascript/spotlight/admin/crop.js
+- app/javascript/spotlight/admin/croppable.es6
+- app/javascript/spotlight/admin/edit_in_place.es6
+- app/javascript/spotlight/admin/exhibit_tag_autocomplete.es6
+- app/javascript/spotlight/admin/exhibits.es6
+- app/javascript/spotlight/admin/form_observer.es6
+- app/javascript/spotlight/admin/iiif.js
+- app/javascript/spotlight/admin/index.js
+- app/javascript/spotlight/admin/locks.es6
+- app/javascript/spotlight/admin/multi_image_selector.js
+- app/javascript/spotlight/admin/pages.es6
+- app/javascript/spotlight/admin/progress_monitor.es6
+- app/javascript/spotlight/admin/readonly_checkbox.es6
+- app/javascript/spotlight/admin/search_typeahead.js
+- app/javascript/spotlight/admin/select_related_input.es6
+- app/javascript/spotlight/admin/sir-trevor/block_controls.js
+- app/javascript/spotlight/admin/sir-trevor/block_limits.js
+- app/javascript/spotlight/admin/sir-trevor/locales.js
+- app/javascript/spotlight/admin/spotlight_nestable.js
+- app/javascript/spotlight/admin/tabs.es6
+- app/javascript/spotlight/admin/translation_progress.es6
+- app/javascript/spotlight/admin/users.es6
+- app/javascript/spotlight/admin/visibility_toggle.es6
+- app/javascript/spotlight/index.js
+- app/javascript/spotlight/spotlight.js
+- app/javascript/spotlight/user/analytics.es6
+- app/javascript/spotlight/user/browse_group_categories.es6
+- app/javascript/spotlight/user/carousel.es6
+- app/javascript/spotlight/user/clear_form_button.es6
+- app/javascript/spotlight/user/index.js
+- app/javascript/spotlight/user/report_a_problem.es6
+- app/javascript/spotlight/user/zpr_links.es6
 - app/jobs/concerns/spotlight/gather_documents.rb
 - app/jobs/concerns/spotlight/job_tracking.rb
 - app/jobs/concerns/spotlight/limit_concurrency.rb
@@ -1505,8 +1478,22 @@ files:
 - lib/generators/spotlight/templates/config/initializers/spotlight_initializer.rb
 - lib/generators/spotlight/templates/config/initializers/translation.rb
 - lib/generators/spotlight/templates/config/sitemap.rb
-- lib/generators/spotlight/templates/solr/config/schema.xml
-- lib/generators/spotlight/templates/solr/config/solrconfig.xml
+- lib/generators/spotlight/templates/solr/conf/_rest_managed.json
+- lib/generators/spotlight/templates/solr/conf/admin-extra.html
+- lib/generators/spotlight/templates/solr/conf/elevate.xml
+- lib/generators/spotlight/templates/solr/conf/mapping-ISOLatin1Accent.txt
+- lib/generators/spotlight/templates/solr/conf/protwords.txt
+- lib/generators/spotlight/templates/solr/conf/schema.xml
+- lib/generators/spotlight/templates/solr/conf/scripts.conf
+- lib/generators/spotlight/templates/solr/conf/solrconfig.xml
+- lib/generators/spotlight/templates/solr/conf/spellings.txt
+- lib/generators/spotlight/templates/solr/conf/stopwords.txt
+- lib/generators/spotlight/templates/solr/conf/stopwords_en.txt
+- lib/generators/spotlight/templates/solr/conf/synonyms.txt
+- lib/generators/spotlight/templates/solr/conf/xslt/example.xsl
+- lib/generators/spotlight/templates/solr/conf/xslt/example_atom.xsl
+- lib/generators/spotlight/templates/solr/conf/xslt/example_rss.xsl
+- lib/generators/spotlight/templates/solr/conf/xslt/luke.xsl
 - lib/generators/spotlight/templates/spotlight.js
 - lib/generators/spotlight/templates/spotlight.scss
 - lib/generators/spotlight/templates/spotlight_helper.rb
@@ -1514,6 +1501,8 @@ files:
 - lib/migration/page_language.rb
 - lib/spotlight.rb
 - lib/spotlight/engine.rb
+- lib/spotlight/riiif_service.rb
+- lib/spotlight/search_state.rb
 - lib/spotlight/upload_field_config.rb
 - lib/spotlight/version.rb
 - lib/tasks/spotlight_tasks.rake
@@ -1557,16 +1546,13 @@ files:
 - spec/support/views/test_view_helpers.rb
 - vendor/assets/images/sir-trevor-icons.svg
 - vendor/assets/javascripts/Leaflet.Editable.js
-- vendor/assets/javascripts/MutationObserver.js
 - vendor/assets/javascripts/Path.Drag.js
 - vendor/assets/javascripts/bootstrap-tagsinput.js
-- vendor/assets/javascripts/eventable.js
 - vendor/assets/javascripts/jquery.serializejson.js
 - vendor/assets/javascripts/jquery.waitforimages.min.js
 - vendor/assets/javascripts/leaflet-iiif.js
 - vendor/assets/javascripts/nestable.js
 - vendor/assets/javascripts/parameterize.js
-- vendor/assets/javascripts/polyfill.min.js
 - vendor/assets/javascripts/sir-trevor.js
 - vendor/assets/javascripts/tiny-slider.js
 - vendor/assets/javascripts/typeahead.bundle.min.js
@@ -1591,7 +1577,8 @@ files:
 - vendor/assets/stylesheets/tiny-slider.css
 homepage: https://github.com/projectblacklight/spotlight
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -1603,11 +1590,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections

data/app/assets/javascripts/spotlight/admin/add_another.js

@@ -1,22 +0,0 @@
-Spotlight.onLoad(function() {
-  $("[data-action='add-another']").on("click", function(event) {
-    event.preventDefault();
-
-    var templateId = $(this).data('template-id');
-
-    var template = document.querySelector('#' + templateId);
-    var clone = document.importNode(template.content, true);
-
-    var count = $(this).closest('.form-group').find('[name="' + $(clone).find('[name]').attr('name') + '"]').length + 1;
-    $(clone).find('[id]').each(function(index, el) {
-      $(el).attr('id', $(el).attr('id') + '_' + String(count));
-    });
-
-    $(clone).find('[for]').each(function(index, el) {
-      $(el).attr('for', $(el).attr('for') + '_' + String(count));
-    });
-
-
-    $(clone).insertBefore(this);
-  });
-});