summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss6
-rw-r--r--changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml4
2 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 838f5442fff..f0b03710c79 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -236,9 +236,13 @@ header.header-sidebar-pinned {
@media (min-width: $screen-md-min) {
padding-right: $gutter_width;
- .merge-request-tabs-holder.affix {
+ &:not(.with-overlay) .merge-request-tabs-holder.affix {
right: $gutter_width;
}
+
+ &.with-overlay .merge-request-tabs-holder.affix {
+ right: $sidebar_collapsed_width;
+ }
}
&.with-overlay {
diff --git a/changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml b/changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml
new file mode 100644
index 00000000000..b8c7b78cf0d
--- /dev/null
+++ b/changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml
@@ -0,0 +1,4 @@
+---
+title: Fixed merge request tabs dont move when opening collapsed sidebar
+merge_request:
+author: