Merge branch 'mr-tabs-alignment-sidebar-open' into 'master'

Correctly keeps merge request tabs in place when editting value in See merge request !8595

Merge branch 'mr-tabs-alignment-sidebar-open' into 'master'
f32159d0 · Annabel Dunstone Gray · James Lopez · 5339e3ff · f32159d0 · f32159d0
Commit f32159d0 authored Jan 17, 2017 by Annabel Dunstone Gray Committed by James Lopez Jan 19, 2017
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: