From ac6556ba91d89d7744bb5562c6bc5e654ab0668c Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Tue, 16 May 2017 14:04:07 +1000
Subject: prevent dropdowns from being cut-off by scrollable tab container

rerender scrollable-tab area after Resolve Discussions button is rendered
---
 app/assets/javascripts/diff_notes/diff_notes_bundle.js | 2 ++
 app/assets/stylesheets/framework/nav.scss              | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/diff_notes/diff_notes_bundle.js b/app/assets/javascripts/diff_notes/diff_notes_bundle.js
index b6b47e2da6f..fdd27534e0e 100644
--- a/app/assets/javascripts/diff_notes/diff_notes_bundle.js
+++ b/app/assets/javascripts/diff_notes/diff_notes_bundle.js
@@ -65,4 +65,6 @@ $(() => {
       'resolve-count': ResolveCount
     }
   });
+
+  $(window).trigger('resize.nav');
 });
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index d2f6a227128..e890c2e0634 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -351,7 +351,10 @@
 
 .scrolling-tabs-container {
   position: relative;
-  overflow: hidden;
+
+  .merge-request-tabs-container & {
+    overflow: hidden;
+  }
 
   .nav-links {
     @include scrolling-links();
@@ -489,7 +492,6 @@
 
 .inner-page-scroll-tabs {
   position: relative;
-  overflow: hidden;
 
   .fade-right {
     @include fade(left, $white-light);
-- 
cgit v1.2.1