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 Conflicts: app/assets/stylesheets/framework/nav.scss

Merge branch '32326-scrollable-tabs-overflow' into 'master'
229b1e2e · Annabel Dunstone Gray · 8cba1f51 · 229b1e2e · 229b1e2e
Commit 229b1e2e authored May 16, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

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

nav.scss app/assets/stylesheets/framework/nav.scss +8 -1

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
@@ -352,6 +352,10 @@
  position: relative;
  overflow: hidden;

+  .merge-request-tabs-container & {
+    overflow: hidden;
+  }
+
  .nav-links {
    @include scrolling-links();
  }
@@ -488,7 +492,10 @@

 .inner-page-scroll-tabs {
  position: relative;
-  overflow: hidden;
+
+  .nav-links {
+    padding-bottom: 1px;
+  }

  .fade-right {
    @include fade(left, $white-light);