Merge branch 'main' into ruby-3.3_rails-7.2

samvera · Jan 23, 2025 · 4e779ed · 4e779ed
2 parents e1c8877 + 3c4a4b5
commit 4e779ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/assets/stylesheets/hyrax/_tinymce.scss b/app/assets/stylesheets/hyrax/_tinymce.scss
@@ -12,3 +12,9 @@
 .home_marketing_text #content_block_external_key {
   color: black;
 }
+
+// Prevents text from being clipped in Tiny MCE bottom status bar and drop-down style menu (Issue #6789)
+.tox .tox-statusbar { overflow: visible !important; }
+.tox .tox-tbtn--bespoke .tox-tbtn__select-label { overflow: visible !important; }
+.tox .tox-tbtn { overflow: visible !important; }
+.tox-tinymce { overflow: visible !important; }
diff --git a/hyrax.gemspec b/hyrax.gemspec
@@ -43,7 +43,7 @@ SUMMARY
   spec.add_dependency 'browse-everything', '>= 0.16', '< 2.0'
   spec.add_dependency 'carrierwave', '~> 1.0'
   spec.add_dependency 'clipboard-rails', '~> 1.5'
-  spec.add_dependency 'concurrent-ruby', '~> 1.0'
+  spec.add_dependency 'concurrent-ruby', '1.3.4' # Pinned until Rails 7 update
   spec.add_dependency 'connection_pool', '~> 2.4'
   spec.add_dependency 'draper', '~> 4.0'
   spec.add_dependency 'dry-logic', '~> 1.5'