Add subnav height to sidebar scroll calculation

5de7eac6 · Annabel Dunstone Gray · 8f93c27d · 5de7eac6
Commit 5de7eac6 authored Mar 27, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/assets/javascripts/right_sidebar.js app/assets/javascripts/right_sidebar.js +1 -1

No files found.
--- 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) {