diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-27 11:07:54 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-28 10:08:16 -0500 |
| commit | 5de7eac67d94751126d14bec6925ed80814ae346 (patch) | |
| tree | 82e6fb7108cc34d536a40feb29c98959a45af062 | |
| parent | 8f93c27d342d29ecabca7ce4247bf105f308383c (diff) | |
| download | gitlab-ce-5de7eac67d94751126d14bec6925ed80814ae346.tar.gz | |
Add subnav height to sidebar scroll calculation
| -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 64a68d56962..9be49b370d2 100644 --- a/app/assets/javascripts/right_sidebar.js +++ b/app/assets/javascripts/right_sidebar.js @@ -198,7 +198,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) { |