Commit 52837476 authored by Kushal Pandya's avatar Kushal Pandya

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

Replace breakpoints with GlBreakpointInstance in epic_bundle.js

See merge request gitlab-org/gitlab!22016
parents abb6de35 3bf811d2
...@@ -2,7 +2,7 @@ import Vue from 'vue'; ...@@ -2,7 +2,7 @@ import Vue from 'vue';
import { mapActions } from 'vuex'; import { mapActions } from 'vuex';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import bp from '~/breakpoints'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import createStore from './store'; import createStore from './store';
...@@ -45,7 +45,7 @@ export default (epicCreate = false) => { ...@@ -45,7 +45,7 @@ export default (epicCreate = false) => {
// Collapse the sidebar on mobile screens by default // Collapse the sidebar on mobile screens by default
const bpBreakpoint = bp.getBreakpointSize(); const bpBreakpoint = bp.getBreakpointSize();
if (bpBreakpoint === 'xs' || bpBreakpoint === 'sm') { if (bpBreakpoint === 'xs' || bpBreakpoint === 'sm' || bpBreakpoint === 'md') {
Cookies.set('collapsed_gutter', true); Cookies.set('collapsed_gutter', true);
} }
......
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