Merge pull request #8760 from opf/revert-8709-sidebar-menu-scrollable

Revert " [33690] wiki after navigate on item in sidebar, the sidebar reset to top and lose the view of focus item"
pull/8771/head
Wieland Lindenthal 4 years ago committed by GitHub
commit 9a4605503b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/views/layouts/base.html.erb
  2. 6
      frontend/src/global_styles/layout/_main_menu.sass

@ -149,7 +149,6 @@ See docs/COPYRIGHT.rdoc for more details.
<h1 class="hidden-for-sighted"><%= t(:label_main_menu) %></h1>
<main-menu-resizer></main-menu-resizer>
<div id="menu-sidebar">
<div class="main-menu-wrapper">
<%= main_menu %>
<%= content_for :main_menu %>
<%= call_hook :view_layouts_base_main_menu %>
@ -160,7 +159,6 @@ See docs/COPYRIGHT.rdoc for more details.
</div>
</div>
</div>
</div>
<% end %>
<div class="content-overlay"></div>
<div id="content-wrapper" class="<%= initial_classes %>">

@ -68,18 +68,12 @@ $menu-item-line-height: 30px
overflow: auto
@include styled-scroll-bar
.main-menu-wrapper
display: flex
flex-direction: column
height: 100%
a:focus
color: var(--main-menu-font-color)
ul
margin: 0
padding: 0
overflow-y: auto
// -------------------- ALL menu items ---------------------------
li

Loading…
Cancel
Save