diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-10 08:16:55 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-08-10 08:16:55 +0000 |
| commit | 7e82da8590fbe992b71e240113a28c62a6124bd1 (patch) | |
| tree | a94151b232311175e229b12e3069422031cc2482 | |
| parent | b79a551cebf83af6d5e634cf17b73e037107ddcf (diff) | |
| parent | dd3e7202abdf5b438e4cc9c65c50622e817dc459 (diff) | |
| download | gitlab-ce-7e82da8590fbe992b71e240113a28c62a6124bd1.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', () => { |