Commit 7b5ef690 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'mw-gl-breakpoints-9' into 'master'

Replace breakpoints with GlBreakpointInstance in jobs/components/job_app.vue

See merge request gitlab-org/gitlab!22014
parents 6e39c0ad 7f6c42ea
......@@ -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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment