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"

app/views/layouts/base.html.erb

@@ -149,15 +149,13 @@ 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 %>
-            <%= main_menu %>
+          <%= content_for :main_menu %>
-            <%= content_for :main_menu %>
+          <%= call_hook :view_layouts_base_main_menu %>
-            <%= call_hook :view_layouts_base_main_menu %>
+          <!-- Sidebar -->
-            <!-- Sidebar -->
+          <div id="sidebar">
-            <div id="sidebar">
+            <%= content_for :sidebar %>
-              <%= content_for :sidebar %>
+            <%= call_hook :view_layouts_base_sidebar %>
-              <%= call_hook :view_layouts_base_sidebar %>
-            </div>
           </div>
         </div>
       </div>

frontend/src/global_styles/layout/_main_menu.sass

@@ -67,11 +67,6 @@ $menu-item-line-height: 30px
       height: calc(100% - (var(--main-menu-item-height) + 10px)) // 10px spacing
       overflow: auto
       @include styled-scroll-bar
-    
-    .main-menu-wrapper
-      display: flex
-      flex-direction: column
-      height: 100%
 
   a:focus
     color: var(--main-menu-font-color)
@@ -79,7 +74,6 @@ $menu-item-line-height: 30px
   ul
     margin: 0
     padding: 0
-    overflow-y: auto
 
     // -------------------- ALL menu items ---------------------------
     li