diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-30 13:00:33 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-30 13:00:33 +0000 |
| commit | 024d8be0f8f0a011f1ab1063073ea6fb6d411f3a (patch) | |
| tree | b2a722df219551935438e65b5bb3f3551ee4b63b | |
| parent | 4d3b5d522322933732dad54c6ef54c8d5c523cb7 (diff) | |
| parent | 5de7eac67d94751126d14bec6925ed80814ae346 (diff) | |
| download | gitlab-ce-024d8be0f8f0a011f1ab1063073ea6fb6d411f3a.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 f3cd41fb4db..a9b3de281e1 100644 --- a/app/assets/javascripts/right_sidebar.js +++ b/app/assets/javascripts/right_sidebar.js @@ -209,7 +209,7 @@ import Cookies from 'js-cookie'; }; 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) { |