diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-23 08:31:20 +0000 |
|---|---|---|
| committer | kushalpandya <kushal@gitlab.com> | 2017-06-23 17:26:54 +0530 |
| commit | 37ed562e2b46cf11e5dc9580e0aadf2c98601306 (patch) | |
| tree | 6412e626a812e50469e4d0d6d877006fd997c538 | |
| parent | eb7b74509b211958d01dbaf1aa214da8c8f85ad8 (diff) | |
| download | gitlab-ce-37ed562e2b46cf11e5dc9580e0aadf2c98601306.tar.gz | |
Merge branch 'fix-sidebar-scroll-jump' into 'master'
Remove layout nav from scroll calculation
Closes #33984
See merge request !12399
| -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); |