summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-20 15:33:13 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-20 15:34:56 -0700
commit7cd053b50aa347f24ffe34fe9d0e492919022e4a (patch)
tree0ad94ea3ed04dfa06d8d3a43b1e2536da4e73b8c
parentd9d1dc99bcf57a2214616cb3d80144b2306f0b8f (diff)
downloadgitlab-ce-7cd053b50aa347f24ffe34fe9d0e492919022e4a.tar.gz
Improve issue sidebar position
-rw-r--r--app/assets/javascripts/issue.js.coffee2
-rw-r--r--app/assets/javascripts/merge_request.js.coffee2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee
index f2753170478..bf71c144eaf 100644
--- a/app/assets/javascripts/issue.js.coffee
+++ b/app/assets/javascripts/issue.js.coffee
@@ -19,6 +19,6 @@ class @Issue
$('.issue-details').waitForImages ->
$('.issuable-affix').affix offset:
top: ->
- @top = $('.issue-details').outerHeight(true) + 25
+ @top = ($('.issuable-affix').offset().top - 70)
bottom: ->
@bottom = $('.footer').outerHeight(true)
diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee
index 10462ac073d..09c202e42a5 100644
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -23,7 +23,7 @@ class @MergeRequest
$('.merge-request-details').waitForImages ->
$('.issuable-affix').affix offset:
top: ->
- @top = $('.merge-request-details').outerHeight(true) + 91
+ @top = ($('.issuable-affix').offset().top - 70)
bottom: ->
@bottom = $('.footer').outerHeight(true)