From 1c05332ed4599452f34dd94912669d85b93543a4 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 28 Oct 2016 09:35:49 +0100
Subject: [PATCH] Fixed sticky MR tabs positioning when sidebar is pinned

Closes #23926
---
 CHANGELOG.md                                  |  1 +
 app/assets/stylesheets/framework/sidebar.scss | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef6bb64215..9b5ab8abe4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@ Please view this file on the master branch, on stable branches it's out of date.
   - Fix importing MR comments from GitHub !7139
   - Modify GitHub importer to be retryable !7003
   - Fix and improve `Sortable.highest_label_priority`
+  - Fixed sticky merge request tabs when sidebar is pinned
 
 ## 8.13.1 (2016-10-25)
   - Fix branch protection API. !6215
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 1d8e64a0e4..c54f7b2757 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -164,6 +164,18 @@
       padding-left: $sidebar_width;
     }
   }
+
+  .merge-request-tabs-holder.affix {
+    @media (min-width: $sidebar-breakpoint) {
+      left: $sidebar_width;
+    }
+  }
+
+  &.right-sidebar-expanded {
+    .line-resolve-all-container {
+      display: none;
+    }
+  }
 }
 
 header.header-sidebar-pinned {
-- 
2.30.9