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-18 13:56:15 -0500 |
| commit | 229b1e2e603fb45df32a7e3fe0e90438a9ff7c4f (patch) | |
| tree | 9b39a77e681648446682b92eb1e1a6fcfc230d12 | |
| parent | 8cba1f51668d11918a963ca46f78e26b9c8d0836 (diff) | |
| download | gitlab-ce-229b1e2e603fb45df32a7e3fe0e90438a9ff7c4f.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
Conflicts:
app/assets/stylesheets/framework/nav.scss
| -rw-r--r-- | app/assets/javascripts/diff_notes/diff_notes_bundle.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 9 |
2 files changed, 10 insertions, 1 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 a30364314cf..b1b9b680cfe 100644 --- 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); |