summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/issuable_context.js.coffee
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/issuable_context.js.coffee')
-rw-r--r--app/assets/javascripts/issuable_context.js.coffee11
1 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/issuable_context.js.coffee b/app/assets/javascripts/issuable_context.js.coffee
index 02232698bc2..bcc3e52bf9b 100644
--- a/app/assets/javascripts/issuable_context.js.coffee
+++ b/app/assets/javascripts/issuable_context.js.coffee
@@ -15,7 +15,16 @@ class @IssuableContext
$(@).width($(@).outerWidth())
.on 'affixed-top.bs.affix affixed-bottom.bs.affix', ->
$(@).width('')
-
+ $discussion = $('.issuable-discussion')
+ $sidebar = $('.issuable-sidebar')
+ discussionHeight = $discussion.height()
+ sidebarHeight = $sidebar.height()
+ console.log(sidebarHeight,discussionHeight)
+ if sidebarHeight > discussionHeight
+ $discussion.height(sidebarHeight + 50)
+ console.log('fixing issues')
+ return
+ # No affix if discussion is smaller than sidebar
$('.issuable-affix').affix offset:
top: ->
@top = ($('.issuable-affix').offset().top - 70)