diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-08-30 10:14:56 +0200 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-08-30 10:14:56 +0200 |
commit | b181d3124e4aefca59fb8fe64400eab8d9c73ad8 (patch) | |
tree | d1a0964c8380abb5781a034dab95e95ac478f7f9 /app/assets/javascripts/lib | |
parent | e5c8d2ca51566f18ef9f203ef90d4fe1fb4fbbfa (diff) | |
parent | 43ba967b0556e2ff01526ff8298f015ec77830f6 (diff) | |
download | gitlab-ce-b181d3124e4aefca59fb8fe64400eab8d9c73ad8.tar.gz |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# app/models/issue.rb
Diffstat (limited to 'app/assets/javascripts/lib')
-rw-r--r-- | app/assets/javascripts/lib/utils/sticky.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/sticky.js b/app/assets/javascripts/lib/utils/sticky.js index ff2b66046b4..283c0ec0410 100644 --- a/app/assets/javascripts/lib/utils/sticky.js +++ b/app/assets/javascripts/lib/utils/sticky.js @@ -1,5 +1,5 @@ export const isSticky = (el, scrollY, stickyTop) => { - const top = el.offsetTop - scrollY; + const top = Math.floor(el.offsetTop - scrollY); if (top <= stickyTop) { el.classList.add('is-stuck'); |