BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 7dd4cb3e by Filipa Lacerda Committed by James Lopez
Options

Merge branch '30063-builds-sidebar-stutter' into 'master'

Add subnav height to sidebar scroll calculation Closes #30063 See merge request !10262
parent f064a842
Showing with 1 addition and 1 deletion
app/assets/javascripts/right_sidebar.js
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
}; };
Sidebar.prototype.setSidebarHeight = function() { Sidebar.prototype.setSidebarHeight = function() {
const $navHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight(); const $navHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight() + $('.sub-nav-scroll').outerHeight();
const $rightSidebar = $('.js-right-sidebar'); const $rightSidebar = $('.js-right-sidebar');
const diff = $navHeight - $(window).scrollTop(); const diff = $navHeight - $(window).scrollTop();
if (diff > 0) { if (diff > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment