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
37ed562e
Commit
37ed562e
authored
Jun 23, 2017
by
Phil Hughes
Committed by
kushalpandya
Jun 23, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'fix-sidebar-scroll-jump' into 'master'
Remove layout nav from scroll calculation Closes #33984 See merge request !12399
parent
eb7b7450
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
right_sidebar.js
app/assets/javascripts/right_sidebar.js
+1
-3
No files found.
app/assets/javascripts/right_sidebar.js
View file @
37ed562e
...
...
@@ -10,8 +10,6 @@ import Cookies from 'js-cookie';
this
.
$sidebarInner
=
this
.
sidebar
.
find
(
'.issuable-sidebar'
);
this
.
$navGitlab
=
$
(
'.navbar-gitlab'
);
this
.
$layoutNav
=
$
(
'.layout-nav'
);
this
.
$subScroll
=
$
(
'.sub-nav-scroll'
);
this
.
$rightSidebar
=
$
(
'.js-right-sidebar'
);
this
.
removeListeners
();
...
...
@@ -215,7 +213,7 @@ import Cookies from 'js-cookie';
};
Sidebar
.
prototype
.
setSidebarHeight
=
function
()
{
const
$navHeight
=
this
.
$navGitlab
.
outerHeight
()
+
this
.
$layoutNav
.
outerHeight
()
+
(
this
.
$subScroll
?
this
.
$subScroll
.
outerHeight
()
:
0
)
;
const
$navHeight
=
this
.
$navGitlab
.
outerHeight
();
const
diff
=
$navHeight
-
$
(
window
).
scrollTop
();
if
(
diff
>
0
)
{
this
.
$rightSidebar
.
outerHeight
(
$
(
window
).
height
()
-
diff
);
...
...
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