Fixes for the mobile menu (#1020)

UNC-Libraries · Oct 4, 2023 · 5d82005 · 5d82005
1 parent d88a8aa
commit 5d82005
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/app/assets/stylesheets/unc_custom.css.scss b/app/assets/stylesheets/unc_custom.css.scss
@@ -101,7 +101,8 @@ span.institution_name {
 
 #top-navbar-collapse {
     .dropdown-menu {
-      left: -70px;
+      margin: 0 -50px;
+      text-align: center;
     }
 }
 
@@ -1062,6 +1063,19 @@ input#check_all {
       border-top: 1px solid transparent;
       box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
       padding-left: 25px;
+      background: inherit;
+      margin: 8px -15px 0 -15px;
+      z-index: 100;
+
+      #user_utility_links {
+        text-align: center;
+      }
+    }
+
+    #navbarDropdown.dropdown-toggle {
+      &:focus {
+        outline: none;
+      }
     }
 
     .navbar-fixed-top {

diff --git a/app/views/_masthead.html.erb b/app/views/_masthead.html.erb
@@ -1,6 +1,6 @@
 <%# [hyc-override] https://github.com/samvera/hyrax/tree/hyrax-v4.0.0/app/views/_masthead.html.erb %>
 <header aria-label="header" class="top-header">
-  <nav id="masthead" class="navbar navbar-expand-lg navbar-dark bg-dark justify-content-between <%= placement_class %>" role="navigation" aria-label="masthead">
+  <nav id="masthead" class="navbar navbar-expand-lg navbar-dark bg-dark <%= placement_class %>" role="navigation" aria-label="masthead">
     <h1 class="sr-only"><%= application_name %></h1>
     <%# [hyc-override] Overriding partial in hyrax gem to make display of logo conditonal %>
     <%= render '/logo' unless controller_name == 'homepage' %>

diff --git a/app/views/layouts/hyrax.html.erb b/app/views/layouts/hyrax.html.erb
@@ -11,7 +11,8 @@
       <%# [hyc-override] Disable turbolinks %>
       <%= link_to "Skip to Content", "#skip-to-content", data: { turbolinks: false } %>
     </div>
-    <%= render '/masthead', placement_class: nil %>
+    <% header_class = controller_name == 'homepage' ? 'justify-content-end' : 'justify-content-between' %>
+    <%= render '/masthead', placement_class: header_class %>
     <%= content_for(:navbar) %>
     <%= content_for(:precontainer_content) %>
     <%# [hyc-override] Change class to container-fluid %>