diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-22 16:34:52 -0500 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-22 16:34:52 -0500 |
commit | c12172ee3374fff0d57b111504773d6e0ad04ee6 (patch) | |
tree | 042b1869899066f89cb77898785c78c4f429511d | |
parent | 65c2a5fe36eb47d803037a1e2b719be580635036 (diff) | |
download | gitlab-ce-c12172ee3374fff0d57b111504773d6e0ad04ee6.tar.gz |
Remove layout nav from scroll calculationfix-sidebar-scroll-jump
-rw-r--r-- | app/assets/javascripts/right_sidebar.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js index da7c0c5a36c..322162afdb8 100644 --- a/app/assets/javascripts/right_sidebar.js +++ b/app/assets/javascripts/right_sidebar.js @@ -10,8 +10,6 @@ import Cookies from 'js-cookie'; this.$sidebarInner = this.sidebar.find('.issuable-sidebar'); this.$navGitlab = $('.navbar-gitlab'); - this.$layoutNav = $('.layout-nav'); - this.$subScroll = $('.sub-nav-scroll'); this.$rightSidebar = $('.js-right-sidebar'); this.removeListeners(); @@ -215,7 +213,7 @@ import Cookies from 'js-cookie'; }; Sidebar.prototype.setSidebarHeight = function() { - const $navHeight = this.$navGitlab.outerHeight() + this.$layoutNav.outerHeight() + (this.$subScroll ? this.$subScroll.outerHeight() : 0); + const $navHeight = this.$navGitlab.outerHeight(); const diff = $navHeight - $(window).scrollTop(); if (diff > 0) { this.$rightSidebar.outerHeight($(window).height() - diff); |