Fix sidebar scrolling
This commit is contained in:
parent
060921921d
commit
eefbc2bf73
2 changed files with 12 additions and 2 deletions
|
@ -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 = {
|
||||||
|
<<<<<<< 3ee255139ab555ec49a177d3b2eed65580f36c4f
|
||||||
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
|
||||||
});
|
});
|
||||||
|
|
|
@ -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) {
|
||||||
|
.content-wrapper {
|
||||||
padding-right: $sidebar_collapsed_width;
|
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 {
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: $screen-md-min) {
|
@media (min-width: $screen-md-min) {
|
||||||
|
.content-wrapper {
|
||||||
padding-right: $gutter_width;
|
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;
|
||||||
|
|
Loading…
Reference in a new issue