From fa5a5b2998cf9b823f0f2308a8550f941b368ef0 Mon Sep 17 00:00:00 2001
From: Ben Pennell <bbpennel@email.unc.edu>
Date: Tue, 24 Oct 2023 09:18:05 -0400
Subject: [PATCH 1/2] Fix user links menu running off the right side of the
 page by right aligning it

---
 app/assets/stylesheets/unc_custom.css.scss | 7 -------
 app/views/_user_util_links.html.erb        | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/unc_custom.css.scss b/app/assets/stylesheets/unc_custom.css.scss
index 5a51d31fa..8434ea2fd 100644
--- a/app/assets/stylesheets/unc_custom.css.scss
+++ b/app/assets/stylesheets/unc_custom.css.scss
@@ -99,13 +99,6 @@ span.institution_name {
   }
 }
 
-#top-navbar-collapse {
-    .dropdown-menu {
-      margin: 0 -50px;
-      text-align: center;
-    }
-}
-
 .advanced_search {
   float: right;
   margin: 0.5rem 1rem 0 0;
diff --git a/app/views/_user_util_links.html.erb b/app/views/_user_util_links.html.erb
index c7b796d3f..eea386f2a 100644
--- a/app/views/_user_util_links.html.erb
+++ b/app/views/_user_util_links.html.erb
@@ -16,7 +16,7 @@
         <span><%= current_user.name %></span>
         <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
       </a>
-      <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+      <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
         <%# [hyc-override] Disabling user profile link %>
         <%# <%= link_to "My Profile", hyrax.dashboard_profile_path(current_user), class: 'dropdown-item' %>
         <%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path, class: "dropdown-item" %>

From 3baa35f44fd7af679095358fc7c947d1e9ec0af7 Mon Sep 17 00:00:00 2001
From: Ben Pennell <bbpennel@email.unc.edu>
Date: Tue, 24 Oct 2023 09:24:57 -0400
Subject: [PATCH 2/2] Update to hyrax ref which includes fix for sidebar
 highlighting issues

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index c0b0c6d50..22ab1f7ab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ gem 'execjs', '2.8.1'
 gem 'httparty', '~>0.21.0'
 gem 'hydra-editor', '~> 6.0'
 gem 'hydra-role-management', '~> 1.0'
-gem 'hyrax', git: 'https://github.com/UNC-Libraries/hyrax.git', branch: 'hyc-1793'
+gem 'hyrax', git: 'https://github.com/UNC-Libraries/hyrax.git', branch: 'unc-hyrax-4-development'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.11.2'
 # Use jquery as the JavaScript library
diff --git a/Gemfile.lock b/Gemfile.lock
index 6b9c9448d..97018b70c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,8 +37,8 @@ GIT
 
 GIT
   remote: https://github.com/UNC-Libraries/hyrax.git
-  revision: 5af9862897810c8b7736062f727613faff391394
-  branch: hyc-1793
+  revision: ca42481857b3b316d2299159bf4340f7d92308f4
+  branch: unc-hyrax-4-development
   specs:
     hyrax (4.0.0)
       active-fedora (~> 14.0)
@@ -191,7 +191,7 @@ GEM
     awesome_nested_set (3.6.0)
       activerecord (>= 4.0.0, < 7.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.835.0)
+    aws-partitions (1.840.0)
     aws-sdk-core (3.185.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)