summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-07 17:20:28 -0600
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-10 15:09:08 -0600
commit3a1b2c9d50f4615ce9e40a8f21ef4885d8283010 (patch)
treef0ae8b41a6b97128d6d106f2e05e81ff415ddfbe
parent4e334538478da577fabf070c493530189c7613cb (diff)
downloadgitlab-ce-3a1b2c9d50f4615ce9e40a8f21ef4885d8283010.tar.gz
common_utils merge conflicts
-rw-r--r--app/assets/javascripts/lib/utils/common_utils.js.es64
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/lib/utils/common_utils.js.es6 b/app/assets/javascripts/lib/utils/common_utils.js.es6
index 0966adcfb68..a910999a440 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js.es6
+++ b/app/assets/javascripts/lib/utils/common_utils.js.es6
@@ -127,12 +127,10 @@
gl.utils.scrollToElement = function($el) {
var top = $el.offset().top;
- gl.navBarHeight = gl.navBarHeight || $('.navbar-gitlab').height();
- gl.navLinksHeight = gl.navLinksHeight || $('.nav-links').height();
gl.mrTabsHeight = gl.mrTabsHeight || $('.merge-request-tabs').height();
return $('body, html').animate({
- scrollTop: top - (gl.navBarHeight + gl.navLinksHeight + gl.mrTabsHeight)
+ scrollTop: top - (gl.mrTabsHeight)
}, 200);
};