diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-08 18:10:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-08 18:10:06 +0300 |
| commit | 66a3180a3b9417cb5259ecca83934f22b136394b (patch) | |
| tree | 5adbb98712fc46b082cff357fdcb85736f9e844b /app/assets/javascripts/fly_out_nav.js | |
| parent | dd18ae74af0dd661ca3a5ff5458feea925af5ab8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/fly_out_nav.js')
| -rw-r--r-- | app/assets/javascripts/fly_out_nav.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/fly_out_nav.js b/app/assets/javascripts/fly_out_nav.js index be7418ba802..0fb70fb831e 100644 --- a/app/assets/javascripts/fly_out_nav.js +++ b/app/assets/javascripts/fly_out_nav.js @@ -88,12 +88,12 @@ export const moveSubItemsToPosition = (el, subItems) => { const boundingRect = el.getBoundingClientRect(); const left = sidebar ? sidebar.offsetWidth : COLLAPSED_PANEL_WIDTH; let top = calculateTop(boundingRect, subItems.offsetHeight); + const isAbove = top < boundingRect.top; if (hasSubItems) { - top -= header.offsetHeight; + top = isAbove ? top : top - header.offsetHeight; } else { top = boundingRect.top; } - const isAbove = top <= boundingRect.top; subItems.classList.add('fly-out-list'); subItems.style.transform = `translate3d(${left}px, ${Math.floor(top) - getHeaderHeight()}px, 0)`; // eslint-disable-line no-param-reassign |