Merge pull request #225 from notch8/i142-home-page-themes

⬆️ Updates submodule hyrax-webapp
notch8 · Feb 4, 2025 · 9aec142 · 9aec142
2 parents d4656b0 + 302a231
commit 9aec142
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/bundler.d/example.rb b/bundler.d/example.rb
@@ -9,3 +9,4 @@
 ensure_gem "sentry-ruby"
 ensure_gem "sentry-rails"
 ensure_gem "sentry-sidekiq"
+ensure_gem "cancancan", "~> 3.0" # cancancan is bundling to v1.17.0 but we need at least 3.0
diff --git a/hyrax-webapp b/hyrax-webapp
+29 −18		app/assets/stylesheets/hyku.scss
+11 −15		app/assets/stylesheets/themes/cultural_repository.scss
+5 −13		app/assets/stylesheets/themes/institutional_repository.scss
+3 −0		app/assets/stylesheets/themes/neutral_repository.scss
+1 −1		app/views/_user_util_links.html.erb
+2 −2		app/views/catalog/_search_form.html.erb
+2 −2		app/views/hyrax/homepage/_explore_collections.html.erb
+1 −1		app/views/hyrax/homepage/_home_content.html.erb
+22 −23		app/views/shared/_footer.html.erb
+2 −2		app/views/themes/cultural_repository/_facets.html.erb
+14 −18		app/views/themes/cultural_repository/_masthead.html.erb
+1 −1		app/views/themes/cultural_repository/_user_util_links.html.erb
+1 −1		app/views/themes/cultural_repository/catalog/_search_form.html.erb
+1 −1		app/views/themes/cultural_repository/layouts/homepage.html.erb
+2 −2		app/views/themes/institutional_repository/_controls.html.erb
+1 −1		app/views/themes/institutional_repository/_logo.html.erb
+11 −16		app/views/themes/institutional_repository/_masthead.html.erb
+2 −2		app/views/themes/neutral_repository/_theme_container.html.erb
+1 −1		spec/features/institutional_repository_theme_spec.rb