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.

Sign up for GitHub

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

Jump to bottom

Hyc-1788/1794 - Sidebar select color, and user links dropdown fixes (hyrax-4) #1035

Merged
merged 2 commits into from
Oct 25, 2023
Merged

Hyc-1788/1794 - Sidebar select color, and user links dropdown fixes (hyrax-4) #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa5a5b2
Fix user links menu running off the right side of the page by right a…
bbpennel Oct 24, 2023
3baa35f
Update to hyrax ref which includes fix for sidebar highlighting issues
bbpennel Oct 24, 2023
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
7 changes: 0 additions & 7 deletions app/assets/stylesheets/unc_custom.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion app/views/_user_util_links.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" %>
Expand Down
Loading