diff options
author | Phil Hughes <me@iamphill.com> | 2016-10-19 16:57:42 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-10-20 21:34:35 +0300 |
commit | 4e03f4c40602b568cffd591dcd5af6bd4b9a281e (patch) | |
tree | fa7de3b03932d58d8032ded6fe927b0fd985fe0b /app/assets/javascripts/merge_request_tabs.js | |
parent | 672ab77bf42383a3fa90905d05b303fbe34263e8 (diff) |
Fixed issues with sticky mr tabs & sidebar
Closes #23504
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
-rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index fd21aa1fefa..1a04a037210 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -388,8 +388,7 @@ // So we dont affix the tabs on these if (Breakpoints.get().getBreakpointSize() === 'xs' || !$tabs.length) return; - var tabsWidth = $tabs.outerWidth(), - $diffTabs = $('#diff-notes-app'), + var $diffTabs = $('#diff-notes-app'), offsetTop = $tabs.offset().top - ($('.navbar-fixed-top').height() + $('.layout-nav').height()); $tabs.off('affix.bs.affix affix-top.bs.affix') @@ -398,18 +397,10 @@ top: offsetTop } }).on('affix.bs.affix', function () { - $tabs.css({ - left: $tabs.offset().left, - width: tabsWidth - }); $diffTabs.css({ marginTop: $tabs.height() }); }).on('affix-top.bs.affix', function () { - $tabs.css({ - left: '', - width: '' - }); $diffTabs.css({ marginTop: '' }); |