Commit 7ba35a21 authored by Mike Greiling's avatar Mike Greiling

Merge branch '48471-sidebar-on-jobs-and-wikis-is-missing-at-small-widths' into 'master'

Resolve "Sidebar on jobs and wikis is missing at small widths"

Closes #48471

See merge request gitlab-org/gitlab-ce!20188
parents 763e6549 eabe1680
...@@ -164,7 +164,7 @@ export default class Job extends LogOutputBehaviours { ...@@ -164,7 +164,7 @@ export default class Job extends LogOutputBehaviours {
// eslint-disable-next-line class-methods-use-this // eslint-disable-next-line class-methods-use-this
shouldHideSidebarForViewport() { shouldHideSidebarForViewport() {
const bootstrapBreakpoint = bp.getBreakpointSize(); const bootstrapBreakpoint = bp.getBreakpointSize();
return bootstrapBreakpoint === 'xs' || bootstrapBreakpoint === 'sm'; return bootstrapBreakpoint === 'xs';
} }
toggleSidebar(shouldHide) { toggleSidebar(shouldHide) {
......
...@@ -48,7 +48,7 @@ export default class Wikis { ...@@ -48,7 +48,7 @@ export default class Wikis {
static sidebarCanCollapse() { static sidebarCanCollapse() {
const bootstrapBreakpoint = bp.getBreakpointSize(); const bootstrapBreakpoint = bp.getBreakpointSize();
return bootstrapBreakpoint === 'xs' || bootstrapBreakpoint === 'sm'; return bootstrapBreakpoint === 'xs';
} }
renderSidebar() { renderSidebar() {
......
---
title: Fix sidebar collapse breapoints for job and wiki pages
merge_request:
author:
type: fixed
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