diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-06 15:07:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-06 15:07:43 +0300 |
| commit | d5e68dfae835516bcc94d208cd7be461e75831ff (patch) | |
| tree | b4bd3d748b530d1129a753f98c90142f943bd2c8 /app/assets/javascripts/fly_out_nav.js | |
| parent | 22856b87805d4e6fe92eee6e9ae3dcdebb75c3f3 (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 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/javascripts/fly_out_nav.js b/app/assets/javascripts/fly_out_nav.js index 893b74a9895..be7418ba802 100644 --- a/app/assets/javascripts/fly_out_nav.js +++ b/app/assets/javascripts/fly_out_nav.js @@ -1,9 +1,8 @@ import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; import { SIDEBAR_COLLAPSED_CLASS } from './contextual_sidebar'; -const isRefactoring = document.body.classList.contains('sidebar-refactoring'); const HIDE_INTERVAL_TIMEOUT = 300; -const COLLAPSED_PANEL_WIDTH = isRefactoring ? 48 : 50; +const COLLAPSED_PANEL_WIDTH = 48; const IS_OVER_CLASS = 'is-over'; const IS_ABOVE_CLASS = 'is-above'; const IS_SHOWING_FLY_OUT_CLASS = 'is-showing-fly-out'; @@ -89,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); - if (isRefactoring && hasSubItems) { + if (hasSubItems) { top -= header.offsetHeight; - } else if (isRefactoring) { + } else { top = boundingRect.top; } - const isAbove = 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 |