Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

πŸ› Update IiifPrint gem #2035

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,15 @@ GIT

GIT
remote: https://github.com/scientist-softserv/iiif_print.git
revision: 9e7837ce4bd08bf8fff9126455d0e0e2602f6018
revision: 5fb1531c2aa4c4797aea5a83c74797148a9fbc32
branch: main
specs:
iiif_print (1.0.0)
blacklight_iiif_search (~> 1.0)
blacklight_iiif_search (>= 1.0, < 3.0)
derivative-rodeo (~> 0.5)
dry-monads (~> 1.4.0)
hyrax (>= 2.5, < 4)
hyrax (>= 2.5, < 6)
nokogiri (>= 1.13.2)
rails (~> 5.0)
rails (>= 5.0, < 8.0)
rdf-vocab (~> 3.0)

GIT
Expand Down Expand Up @@ -344,7 +343,7 @@ GEM
declarative-option (0.1.0)
deprecation (1.1.0)
activesupport
derivative-rodeo (0.5.0)
derivative-rodeo (0.5.1)
activesupport (>= 5)
aws-sdk-s3
aws-sdk-sqs
Expand Down
2 changes: 1 addition & 1 deletion app/forms/hyrax/forms/admin/appearance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ def convert_to_rgba(hex_color, alpha = 0.5)
end

def default_values
@default_values ||= DEFAULT_FONTS.merge(DEFAULT_COLORS)
@default_values ||= default_fonts.merge(default_colors)
end

def block_for(name, dynamic_default = nil)
Expand Down