Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
e36d26c6e4
commit
916ae24336
|
@ -2,9 +2,9 @@
|
||||||
import _ from 'underscore';
|
import _ from 'underscore';
|
||||||
import { mapGetters, mapState, mapActions } from 'vuex';
|
import { mapGetters, mapState, mapActions } from 'vuex';
|
||||||
import { GlLoadingIcon } from '@gitlab/ui';
|
import { GlLoadingIcon } from '@gitlab/ui';
|
||||||
|
import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
|
||||||
import { isScrolledToBottom } from '~/lib/utils/scroll_utils';
|
import { isScrolledToBottom } from '~/lib/utils/scroll_utils';
|
||||||
import { polyfillSticky } from '~/lib/utils/sticky';
|
import { polyfillSticky } from '~/lib/utils/sticky';
|
||||||
import bp from '~/breakpoints';
|
|
||||||
import CiHeader from '~/vue_shared/components/header_ci_component.vue';
|
import CiHeader from '~/vue_shared/components/header_ci_component.vue';
|
||||||
import Callout from '~/vue_shared/components/callout.vue';
|
import Callout from '~/vue_shared/components/callout.vue';
|
||||||
import Icon from '~/vue_shared/components/icon.vue';
|
import Icon from '~/vue_shared/components/icon.vue';
|
||||||
|
@ -200,7 +200,8 @@ export default {
|
||||||
this.updateScroll();
|
this.updateScroll();
|
||||||
},
|
},
|
||||||
updateSidebar() {
|
updateSidebar() {
|
||||||
if (bp.getBreakpointSize() === 'xs') {
|
const breakpoint = bp.getBreakpointSize();
|
||||||
|
if (breakpoint === 'xs' || breakpoint === 'sm') {
|
||||||
this.hideSidebar();
|
this.hideSidebar();
|
||||||
} else if (!this.isSidebarOpen) {
|
} else if (!this.isSidebarOpen) {
|
||||||
this.showSidebar();
|
this.showSidebar();
|
||||||
|
|
Loading…
Reference in New Issue