diff options
author | Phil Hughes <me@iamphill.com> | 2017-08-10 09:10:25 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-08-15 09:28:00 +0100 |
commit | b5a773923e49d40fd06806541b89ecb947b45884 (patch) | |
tree | 039874b4201e148787158d0aa063305cfb2a6691 /app/assets/javascripts | |
parent | de0d0e4e47dffdab3f507ba93dcdff27da4d7421 (diff) | |
download | gitlab-ce-b5a773923e49d40fd06806541b89ecb947b45884.tar.gz |
Fix the fly-out menu in the sidebar not displaying in Safarisafari-fly-out-fix
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/fly_out_nav.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/fly_out_nav.js b/app/assets/javascripts/fly_out_nav.js index cbc3ad23990..32cb42c8b10 100644 --- a/app/assets/javascripts/fly_out_nav.js +++ b/app/assets/javascripts/fly_out_nav.js @@ -15,6 +15,10 @@ export const setOpenMenu = (menu = null) => { currentOpenMenu = menu; }; export const slope = (a, b) => (b.y - a.y) / (b.x - a.x); +let headerHeight = 50; + +export const getHeaderHeight = () => headerHeight; + export const canShowActiveSubItems = (el) => { const isHiddenByMedia = bp.getBreakpointSize() === 'sm' || bp.getBreakpointSize() === 'md'; @@ -74,7 +78,7 @@ export const moveSubItemsToPosition = (el, subItems) => { const isAbove = top < boundingRect.top; subItems.classList.add('fly-out-list'); - subItems.style.transform = `translate3d(0, ${Math.floor(top)}px, 0)`; // eslint-disable-line no-param-reassign + subItems.style.transform = `translate3d(0, ${Math.floor(top) - headerHeight}px, 0)`; // eslint-disable-line no-param-reassign const subItemsRect = subItems.getBoundingClientRect(); @@ -153,6 +157,8 @@ export default () => { }, getHideSubItemsInterval()); }); + headerHeight = document.querySelector('.nav-sidebar').offsetTop; + items.forEach((el) => { const subItems = el.querySelector('.sidebar-sub-level-items'); |