diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-10 08:16:55 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-08-11 10:25:29 -0500 |
| commit | c8add41992624a9b802726d6e71b616cbe6aa70d (patch) | |
| tree | 63a749511e6d0308cd7f7c4b175bb144714b04d2 | |
| parent | f6821c2dc2880a1fc4ff1982219042b4649c273f (diff) | |
| download | gitlab-ce-c8add41992624a9b802726d6e71b616cbe6aa70d.tar.gz | |
Merge branch 'fly-out-fix-hiding' into 'master'
Removed display styles when hiding the fly out navigation
Closes #36224
See merge request !13431
| -rw-r--r-- | app/assets/javascripts/fly_out_nav.js | 3 | ||||
| -rw-r--r-- | spec/javascripts/fly_out_nav_spec.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/fly_out_nav.js b/app/assets/javascripts/fly_out_nav.js index aabea56408a..ad957f132b8 100644 --- a/app/assets/javascripts/fly_out_nav.js +++ b/app/assets/javascripts/fly_out_nav.js @@ -49,7 +49,8 @@ export const hideSubLevelItems = (el) => { el.classList.remove('is-showing-fly-out'); el.classList.remove('is-over'); - subItems.style.display = 'none'; + subItems.style.display = ''; + subItems.style.transform = ''; subItems.classList.remove('is-above'); }; diff --git a/spec/javascripts/fly_out_nav_spec.js b/spec/javascripts/fly_out_nav_spec.js index ea2a4caffaf..d7b7acaa3f4 100644 --- a/spec/javascripts/fly_out_nav_spec.js +++ b/spec/javascripts/fly_out_nav_spec.js @@ -59,7 +59,7 @@ describe('Fly out sidebar navigation', () => { expect( el.querySelector('.sidebar-sub-level-items').style.display, - ).toBe('none'); + ).toBe(''); }); it('does not hude subitems on mobile', () => { |