diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-30 12:09:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-30 12:09:03 +0300 |
commit | 916ae24336fa8f3e2b5d005760bb85d2e0fc2428 (patch) | |
tree | c0822762877fa12451d5efca9893fd6cd2e22afb /app | |
parent | e36d26c6e48724229ddff62fc2d218d06bff8bef (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/jobs/components/job_app.vue | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue index 859f839741f..809b3d5f57e 100644 --- a/app/assets/javascripts/jobs/components/job_app.vue +++ b/app/assets/javascripts/jobs/components/job_app.vue @@ -2,9 +2,9 @@ import _ from 'underscore'; import { mapGetters, mapState, mapActions } from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; +import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; import { isScrolledToBottom } from '~/lib/utils/scroll_utils'; import { polyfillSticky } from '~/lib/utils/sticky'; -import bp from '~/breakpoints'; import CiHeader from '~/vue_shared/components/header_ci_component.vue'; import Callout from '~/vue_shared/components/callout.vue'; import Icon from '~/vue_shared/components/icon.vue'; @@ -200,7 +200,8 @@ export default { this.updateScroll(); }, updateSidebar() { - if (bp.getBreakpointSize() === 'xs') { + const breakpoint = bp.getBreakpointSize(); + if (breakpoint === 'xs' || breakpoint === 'sm') { this.hideSidebar(); } else if (!this.isSidebarOpen) { this.showSidebar(); |