common_utils merge conflicts

3a1b2c9d · Annabel Dunstone Gray · 4e334538 · 3a1b2c9d
Commit 3a1b2c9d authored Feb 07, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

common_utils.js.es6 app/assets/javascripts/lib/utils/common_utils.js.es6 +1 -3

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