summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushal@gitlab.com>2016-12-14 21:47:08 +0530
committerKushal Pandya <kushal@gitlab.com>2016-12-21 13:16:18 +0530
commit3817daa37a77193c5f9479136a06c4737b037818 (patch)
treeadd4b052af991d5a16ee366074ddc3354d088c49
parent63ca9fd0c85fbb5364ee8bf96e78e8ea6bb0427b (diff)
downloadgitlab-ce-3817daa37a77193c5f9479136a06c4737b037818.tar.gz
Fix scroll top button overlapping
-rw-r--r--app/assets/javascripts/build.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js
index c3cbd07ae21..1cf5e22d7f6 100644
--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -184,7 +184,7 @@
this.$autoScrollContainer.hide();
this.$autoScrollStatusText.removeClass('animate');
} else if ((!gl.utils.isInViewport(this.$upBuildTrace[0]) && gl.utils.isInViewport(this.$downBuildTrace[0])) ||
- gl.utils.isInViewport(this.$buildRefreshAnimation[0])) { // User is at Bottom of Build Log
+ (this.$buildRefreshAnimation.is(':visible') && gl.utils.isInViewport(this.$buildRefreshAnimation[0]))) { // User is at Bottom of Build Log
this.$scrollTopBtn.show();
this.$scrollBottomBtn.hide();