diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-16 19:37:16 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-16 19:37:16 +0000 |
| commit | 10a9ba3a1cd35c42b088ba5814ec35beb0e989fc (patch) | |
| tree | 07c259879397f8ca02e2a6e8cf9aa2bfa68879b6 | |
| parent | ba44ca13eafd3cd89e67ebc85c558e7ecad957b6 (diff) | |
| parent | ac6556ba91d89d7744bb5562c6bc5e654ab0668c (diff) | |
| download | gitlab-ce-10a9ba3a1cd35c42b088ba5814ec35beb0e989fc.tar.gz | |
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
| -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); |