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
c84b03d1
Commit
c84b03d1
authored
Mar 24, 2017
by
Alfredo Sumaran
Committed by
Lin Jen-Shin
Mar 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch '29979-firefox-sidebar-height' into 'master'
Fix firefox sidebar height bug Closes #29979 See merge request !10195
parent
6b0bc677
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
right_sidebar.js
app/assets/javascripts/right_sidebar.js
+1
-1
No files found.
app/assets/javascripts/right_sidebar.js
View file @
c84b03d1
...
...
@@ -199,7 +199,7 @@
Sidebar
.
prototype
.
setSidebarHeight
=
function
()
{
const
$navHeight
=
$
(
'.navbar-gitlab'
).
outerHeight
()
+
$
(
'.layout-nav'
).
outerHeight
();
const
$rightSidebar
=
$
(
'.js-right-sidebar'
);
const
diff
=
$navHeight
-
$
(
'body'
).
scrollTop
();
const
diff
=
$navHeight
-
$
(
window
).
scrollTop
();
if
(
diff
>
0
)
{
$rightSidebar
.
outerHeight
(
$
(
window
).
height
()
-
diff
);
}
else
{
...
...
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