Merge branch 'dartsass' into zeitwerk

Digital-Repository-of-Ireland · Nov 7, 2024 · acc9b4d · acc9b4d
2 parents a57bcf3 + 7741705
commit acc9b4d
Show file tree

Hide file tree

Showing 8 changed files with 9,851 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -16,7 +16,6 @@ gemspec
 gem 'paper_trail'
 gem 'user_group', git: '[email protected]:Digital-Repository-of-Ireland/dri-user-group.git', branch: 'main'
 gem 'avalon_ingest', git: 'https://github.com/stkenny/avalon_ingest'
-gem 'jstree-rails-4', git: 'https://github.com/kesha-antonov/jstree-rails-4'
 
 gem 'simplecov', require: false, group: :test
 gem 'database_cleaner', require: false, group: :test
diff --git a/app/assets/javascripts/dri_batch_ingest.js b/app/assets/javascripts/dri_batch_ingest.js
@@ -12,7 +12,7 @@
 //
 //= require underscore
 //= require jquery-smartwizard/jquery.smartWizard.min
-//= require jstree
+//= require jstree/jstree
 //= require browse_everything
 //= require dri_batch_ingest/create_ingest
 //= require dri_batch_ingest/manifest_ingest
diff --git a/app/assets/stylesheets/dri_batch_ingest.scss b/app/assets/stylesheets/dri_batch_ingest.scss
@@ -1,5 +1,5 @@
 @import "jquery-smartwizard/smart_wizard_all.min";
-@import "jstree-default";
+@import "jstree/style";
 @import "browse_everything";
 
 .ingest-wizard-container {

diff --git a/lib/dri_batch_ingest/engine.rb b/lib/dri_batch_ingest/engine.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require 'underscore-rails'
-require 'jstree-rails-4'
 require 'browse_everything'
 
 module DRIBatchIngest

diff --git a/vendor/assets/images/jstree/32px.png b/vendor/assets/images/jstree/32px.png
diff --git a/vendor/assets/images/jstree/40px.png b/vendor/assets/images/jstree/40px.png