Merge branch '32326-scrollable-tabs-overflow' into 'master'

prevent dropdowns from being cut-off by scrollable tab container Closes #32328 and #32326 See merge request !11399

Merge branch '32326-scrollable-tabs-overflow' into 'master'
10a9ba3a · Annabel Dunstone Gray · ba44ca13 · ac6556ba · 10a9ba3a · 10a9ba3a
Commit 10a9ba3a authored May 16, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

diff_notes_bundle.js app/assets/javascripts/diff_notes/diff_notes_bundle.js +2 -0

nav.scss app/assets/stylesheets/framework/nav.scss +4 -2

No files found.
--- 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');
 });
--- 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);