diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-30 13:00:33 +0000 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-04-03 12:45:08 +0200 |
| commit | 7dd4cb3ed82c734f62513f9808375ae5f1ce9d28 (patch) | |
| tree | 53353528dbbf119a71255eab41659f50c38eee87 | |
| parent | f064a842afce77b64d0e6305130821f8b21cba8b (diff) | |
| download | gitlab-ce-7dd4cb3ed82c734f62513f9808375ae5f1ce9d28.tar.gz | |
Merge branch '30063-builds-sidebar-stutter' into 'master'
Add subnav height to sidebar scroll calculation
Closes #30063
See merge request !10262
| -rw-r--r-- | app/assets/javascripts/right_sidebar.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js index fed06433006..84bc7014c37 100644 --- a/app/assets/javascripts/right_sidebar.js +++ b/app/assets/javascripts/right_sidebar.js @@ -197,7 +197,7 @@ }; 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 diff = $navHeight - $(window).scrollTop(); if (diff > 0) { |