root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

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
This commit is contained in:
Mike Greiling 2018-06-28 21:51:14 +00:00
parent 763e6549e7 eabe16802a
commit 7ba35a21f9
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/job.js
View File

@ -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) {

2
app/assets/javascripts/pages/projects/wikis/wikis.js
View File

@ -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() {

5
changelogs/unreleased/48471-sidebar-on-jobs-and-wikis-is-missing-at-small-widths.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix sidebar collapse breapoints for job and wiki pages
merge_request:
author:
type: fixed