diff options
author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-10-21 23:52:17 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-11-10 01:16:21 +0000 |
commit | f02f08f53c551c79cb26457182b584e4f38f4437 (patch) | |
tree | 0784e3f79fa7ddfed07bee11ed08225c9f38d9a4 /app/assets/javascripts/merge_request_tabs.js | |
parent | 0c99e5d0b6b457ef7db2c36f1394fad5c63d1142 (diff) | |
download | gitlab-ce-f02f08f53c551c79cb26457182b584e4f38f4437.tar.gz |
Account for merge request fixed affix bar23520-mr-sticky-tabs-overlap-discussion-from-anchor
account for merge request fixed affix bar when adjusting scroll targets
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
-rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 860ee5df57e..f06b10a9cf7 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -130,7 +130,7 @@ MergeRequestTabs.prototype.scrollToElement = function(container) { var $el, navBarHeight; if (window.location.hash) { - navBarHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight(); + navBarHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight() + document.querySelector('.js-tabs-affix').offsetHeight; $el = $(container + " " + window.location.hash + ":not(.match)"); if ($el.length) { return $.scrollTo(container + " " + window.location.hash + ":not(.match)", { |