diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-18 23:45:51 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-11 00:09:08 +0300 |
| commit | eefbc2bf738b9b715aad3777868d4dbeaadf612e (patch) | |
| tree | 095086a42f12a50ae0d3b61397d4033a39419144 /app/assets/javascripts/build.js | |
| parent | 060921921d920e9f4942885507a7296424ddf08c (diff) | |
Fix sidebar scrolling
Diffstat (limited to 'app/assets/javascripts/build.js')
| -rw-r--r-- | app/assets/javascripts/build.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js index 0152be88b48..a378e5e27b8 100644 --- a/app/assets/javascripts/build.js +++ b/app/assets/javascripts/build.js @@ -68,9 +68,15 @@ Build.prototype.initSidebar = function() { this.$sidebar = $('.js-build-sidebar'); 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 }); |