BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
fd072e22
Commit
fd072e22
authored
Jun 08, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '33202-scrollbar-center' into 'master'
Resolve "Jobs page scrollbar and centering" Closes #33202 See merge request !12000
parents
1490d65e
b2a27d4a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
build.js
app/assets/javascripts/build.js
+2
-2
nav_helper.rb
app/helpers/nav_helper.rb
+1
-1
No files found.
app/assets/javascripts/build.js
View file @
fd072e22
...
...
@@ -80,7 +80,7 @@ window.Build = (function () {
this
.
$scrollContainer
.
niceScroll
({
cursorcolor
:
'#fff'
,
cursoropacitymin
:
1
,
cursorwidth
:
'
3
px'
,
cursorwidth
:
'
7
px'
,
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
)
...
...
app/helpers/nav_helper.rb
View file @
fd072e22
...
...
@@ -13,7 +13,7 @@ module NavHelper
else
"page-gutter right-sidebar-expanded"
end
elsif
current_path?
(
'
build
s#show'
)
elsif
current_path?
(
'
job
s#show'
)
"page-gutter build-sidebar right-sidebar-expanded"
elsif
current_path?
(
'wikis#show'
)
||
current_path?
(
'wikis#edit'
)
||
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment