Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-23 15:08:18 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-23 15:08:18 +0300
commit4aeb8a02c506eaa8f0710ee17edd9e35dd68d280 (patch)
tree42a0ab818ee72a5f99d017f7ca05b6b6349e142a /app/assets/javascripts/fly_out_nav.js
parentb8bb2148c282f5ebaf5cd3c83d905285902a1446 (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.js7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/assets/javascripts/fly_out_nav.js b/app/assets/javascripts/fly_out_nav.js
index 2566ed6b47c..b9ce0851585 100644
--- a/app/assets/javascripts/fly_out_nav.js
+++ b/app/assets/javascripts/fly_out_nav.js
@@ -1,4 +1,4 @@
-import bp from './breakpoints';
+import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
import { SIDEBAR_COLLAPSED_CLASS } from './contextual_sidebar';
const HIDE_INTERVAL_TIMEOUT = 300;
@@ -40,10 +40,7 @@ export const canShowActiveSubItems = el => {
return true;
};
-export const canShowSubItems = () =>
- bp.getBreakpointSize() === 'sm' ||
- bp.getBreakpointSize() === 'md' ||
- bp.getBreakpointSize() === 'lg';
+export const canShowSubItems = () => ['md', 'lg', 'xl'].includes(bp.getBreakpointSize());
export const getHideSubItemsInterval = () => {
if (!currentOpenMenu || !mousePos.length) return 0;