diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-05-16 14:04:07 +1000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-16 11:39:15 -0500 |
| commit | ac6556ba91d89d7744bb5562c6bc5e654ab0668c (patch) | |
| tree | 252bb25fd727f6664254897be3ef8f0e361f166c | |
| parent | 43befaf25f4f929d01a0af5ef3c2148002be7f4e (diff) | |
| download | gitlab-ce-32326-scrollable-tabs-overflow.tar.gz | |
prevent dropdowns from being cut-off by scrollable tab container32326-scrollable-tabs-overflow
rerender scrollable-tab area after Resolve Discussions button is rendered
| -rw-r--r-- | app/assets/javascripts/diff_notes/diff_notes_bundle.js | 2 | ||||
| -rw-r--r-- | 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); |