From b2a27d4a2cbb4f70779cec20f299883e0a27bd60 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Thu, 8 Jun 2017 12:21:03 +0000 Subject: Resolve "Jobs page scrollbar and centering" --- app/assets/javascripts/build.js | 4 ++-- app/helpers/nav_helper.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js index 072a899e9f2..3b2bb6f082f 100644 --- a/app/assets/javascripts/build.js +++ b/app/assets/javascripts/build.js @@ -80,7 +80,7 @@ window.Build = (function () { this.$scrollContainer.niceScroll({ cursorcolor: '#fff', cursoropacitymin: 1, - cursorwidth: '3px', + cursorwidth: '7px', railpadding: { top: 5, bottom: 5, right: 5 }, }); @@ -238,7 +238,7 @@ window.Build = (function () { }; Build.prototype.toggleSidebar = function (shouldHide) { - const shouldShow = !shouldHide; + const shouldShow = typeof shouldHide === 'boolean' ? !shouldHide : undefined; this.$buildTrace .toggleClass('sidebar-expanded', shouldShow) diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 17bfd07e00f..88dfe78c90c 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -13,7 +13,7 @@ module NavHelper else "page-gutter right-sidebar-expanded" end - elsif current_path?('builds#show') + elsif current_path?('jobs#show') "page-gutter build-sidebar right-sidebar-expanded" elsif current_path?('wikis#show') || current_path?('wikis#edit') || -- cgit v1.2.1