kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Annabel Dunstone Gray 2017-05-16 19:37:16 +00:00
parent ba44ca13ea ac6556ba91
commit 10a9ba3a1c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/diff_notes/diff_notes_bundle.js
View File

@ -65,4 +65,6 @@ $(() => {
'resolve-count': ResolveCount
}
});
$(window).trigger('resize.nav');
});

6
app/assets/stylesheets/framework/nav.scss
View File

@ -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);