Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
eefbc2bf
Commit
eefbc2bf
authored
8 years ago
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix sidebar scrolling
parent
06092192
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
app/assets/javascripts/build.js
app/assets/javascripts/build.js
+6
-0
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+6
-2
No files found.
app/assets/javascripts/build.js
View file @
eefbc2bf
...
@@ -68,9 +68,15 @@
...
@@ -68,9 +68,15 @@
Build
.
prototype
.
initSidebar
=
function
()
{
Build
.
prototype
.
initSidebar
=
function
()
{
this
.
$sidebar
=
$
(
'
.js-build-sidebar
'
);
this
.
$sidebar
=
$
(
'
.js-build-sidebar
'
);
this
.
sidebarTranslationLimits
=
{
this
.
sidebarTranslationLimits
=
{
<<<<<<<
3
ee255139ab555ec49a177d3b2eed65580f36c4f
min
:
$
(
'
.navbar-gitlab
'
).
outerHeight
()
+
$
(
'
.layout-nav
'
).
outerHeight
()
min
:
$
(
'
.navbar-gitlab
'
).
outerHeight
()
+
$
(
'
.layout-nav
'
).
outerHeight
()
};
};
this
.
sidebarTranslationLimits
.
max
=
this
.
sidebarTranslationLimits
.
min
+
$
(
'
.scrolling-tabs-container
'
).
outerHeight
();
this
.
sidebarTranslationLimits
.
max
=
this
.
sidebarTranslationLimits
.
min
+
$
(
'
.scrolling-tabs-container
'
).
outerHeight
();
=======
min
:
0
}
this
.
sidebarTranslationLimits
.
max
=
$
(
'
.scrolling-tabs-container
'
).
outerHeight
()
+
$
(
'
.navbar-gitlab
'
).
outerHeight
()
+
$
(
'
.layout-nav
'
).
outerHeight
();
>>>>>>>
Fix
sidebar
scrolling
this
.
$sidebar
.
css
({
this
.
$sidebar
.
css
({
top
:
this
.
sidebarTranslationLimits
.
max
top
:
this
.
sidebarTranslationLimits
.
max
});
});
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/sidebar.scss
View file @
eefbc2bf
...
@@ -208,7 +208,9 @@ header.header-sidebar-pinned {
...
@@ -208,7 +208,9 @@ header.header-sidebar-pinned {
padding-right
:
0
;
padding-right
:
0
;
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
padding-right
:
$sidebar_collapsed_width
;
.content-wrapper
{
padding-right
:
$sidebar_collapsed_width
;
}
.merge-request-tabs-holder.affix
{
.merge-request-tabs-holder.affix
{
right
:
$sidebar_collapsed_width
;
right
:
$sidebar_collapsed_width
;
...
@@ -234,7 +236,9 @@ header.header-sidebar-pinned {
...
@@ -234,7 +236,9 @@ header.header-sidebar-pinned {
}
}
@media
(
min-width
:
$screen-md-min
)
{
@media
(
min-width
:
$screen-md-min
)
{
padding-right
:
$gutter_width
;
.content-wrapper
{
padding-right
:
$gutter_width
;
}
&
:not
(
.with-overlay
)
.merge-request-tabs-holder.affix
{
&
:not
(
.with-overlay
)
.merge-request-tabs-holder.affix
{
right
:
$gutter_width
;
right
:
$gutter_width
;
...
...
This diff is collapsed.
Click to expand it.
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