Commit fd072e22 authored by Phil Hughes's avatar Phil Hughes

Merge branch '33202-scrollbar-center' into 'master'

Resolve "Jobs page scrollbar and centering"

Closes #33202

See merge request !12000
parents 1490d65e b2a27d4a
...@@ -80,7 +80,7 @@ window.Build = (function () { ...@@ -80,7 +80,7 @@ window.Build = (function () {
this.$scrollContainer.niceScroll({ this.$scrollContainer.niceScroll({
cursorcolor: '#fff', cursorcolor: '#fff',
cursoropacitymin: 1, cursoropacitymin: 1,
cursorwidth: '3px', cursorwidth: '7px',
railpadding: { top: 5, bottom: 5, right: 5 }, railpadding: { top: 5, bottom: 5, right: 5 },
}); });
...@@ -238,7 +238,7 @@ window.Build = (function () { ...@@ -238,7 +238,7 @@ window.Build = (function () {
}; };
Build.prototype.toggleSidebar = function (shouldHide) { Build.prototype.toggleSidebar = function (shouldHide) {
const shouldShow = !shouldHide; const shouldShow = typeof shouldHide === 'boolean' ? !shouldHide : undefined;
this.$buildTrace this.$buildTrace
.toggleClass('sidebar-expanded', shouldShow) .toggleClass('sidebar-expanded', shouldShow)
......
...@@ -13,7 +13,7 @@ module NavHelper ...@@ -13,7 +13,7 @@ module NavHelper
else else
"page-gutter right-sidebar-expanded" "page-gutter right-sidebar-expanded"
end end
elsif current_path?('builds#show') elsif current_path?('jobs#show')
"page-gutter build-sidebar right-sidebar-expanded" "page-gutter build-sidebar right-sidebar-expanded"
elsif current_path?('wikis#show') || elsif current_path?('wikis#show') ||
current_path?('wikis#edit') || current_path?('wikis#edit') ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment