Correctly keeps merge request tabs in place when editting value in

collapsed sidebar Previously the CSS would presume the sidebar is open, which it is but as an overlay so the CSS was pushing the tabs when it shouldnt of been

Correctly keeps merge request tabs in place when editting value in
3f581e8d · Phil Hughes · 79373bdc · 3f581e8d · 3f581e8d
Commit 3f581e8d authored Jan 16, 2017 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

sidebar.scss app/assets/stylesheets/framework/sidebar.scss +5 -1

mr-tabs-alignment-sidebar-open.yml changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml +4 -0

No files found.
--- 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 {

--- a/changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml
+++ b/changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml
+---
+title: Fixed merge request tabs dont move when opening collapsed sidebar
+merge_request:
+author: