diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-20 14:44:06 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-10 15:09:08 -0600 |
| commit | bc6ad4f0fdbfedefcb7f439da4ca5ee5f0a4a416 (patch) | |
| tree | 80169c3bd5f78cdd59e8de1376e5d0a2fef04b79 | |
| parent | 8891536c47e0d1619df8527ee5c15fb2c5d020d4 (diff) | |
| download | gitlab-ce-bc6ad4f0fdbfedefcb7f439da4ca5ee5f0a4a416.tar.gz | |
Fix build sidebar scrolling
| -rw-r--r-- | app/assets/javascripts/build.js | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js index 86fb08c00a5..c5a962dd199 100644 --- a/app/assets/javascripts/build.js +++ b/app/assets/javascripts/build.js @@ -67,22 +67,6 @@ Build.prototype.initSidebar = function() { this.$sidebar = $('.js-build-sidebar'); -<<<<<<< 36beffc12461d2e479ad8b000b7ba5b6ea40cd33 - this.sidebarTranslationLimits = { -<<<<<<< 3ee255139ab555ec49a177d3b2eed65580f36c4f - min: $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight() - }; - this.sidebarTranslationLimits.max = this.sidebarTranslationLimits.min + $('.scrolling-tabs-container').outerHeight(); -======= - min: 0 - } - this.sidebarTranslationLimits.max = $('.scrolling-tabs-container').outerHeight() + $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight(); ->>>>>>> Fix sidebar scrolling - this.$sidebar.css({ - top: this.sidebarTranslationLimits.max - }); -======= ->>>>>>> Keep sidebars absolute until fixed at top; remove unneeded JS this.$sidebar.niceScroll(); this.$document.off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.toggleSidebar); }; |