diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-08 12:21:03 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-08 12:21:03 +0000 |
| commit | fd072e2221147f52edf74d4dcedb2ffa3799ab2f (patch) | |
| tree | e5b57726d1bce53800fae05875492bddbfeb95d8 | |
| parent | 1490d65e4541f8fdf4fc8257b0621bdd750dd904 (diff) | |
| parent | b2a27d4a2cbb4f70779cec20f299883e0a27bd60 (diff) | |
| download | gitlab-ce-fd072e2221147f52edf74d4dcedb2ffa3799ab2f.tar.gz | |
Merge branch '33202-scrollbar-center' into 'master'
Resolve "Jobs page scrollbar and centering"
Closes #33202
See merge request !12000
| -rw-r--r-- | app/assets/javascripts/build.js | 4 | ||||
| -rw-r--r-- | 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') || |