kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix build sidebar scrolling

Browse source
This commit is contained in:
Annabel Dunstone Gray 2017-01-20 14:44:06 -06:00
parent 8891536c47
commit bc6ad4f0fd
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/assets/javascripts/build.js
View file

@ -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);
};