diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-06-28 21:51:14 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-07-04 11:30:45 +0100 |
| commit | 5dd1c759796fe2c7d061cce36f3d3213c65cd12e (patch) | |
| tree | df5bb36e1b851c0b76274f2e9b6fda042925ef2e | |
| parent | b69b6de3be1c91a0f4e75fd6cf19925fc0278147 (diff) | |
| download | gitlab-ce-5dd1c759796fe2c7d061cce36f3d3213c65cd12e.tar.gz | |
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
3 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/job.js b/app/assets/javascripts/job.js index fc13f467675..d4f2a3ef7d3 100644 --- a/app/assets/javascripts/job.js +++ b/app/assets/javascripts/job.js @@ -164,7 +164,7 @@ export default class Job extends LogOutputBehaviours { // eslint-disable-next-line class-methods-use-this shouldHideSidebarForViewport() { const bootstrapBreakpoint = bp.getBreakpointSize(); - return bootstrapBreakpoint === 'xs' || bootstrapBreakpoint === 'sm'; + return bootstrapBreakpoint === 'xs'; } toggleSidebar(shouldHide) { diff --git a/app/assets/javascripts/pages/projects/wikis/wikis.js b/app/assets/javascripts/pages/projects/wikis/wikis.js index dcd0b9a76ce..d3e8dbf4000 100644 --- a/app/assets/javascripts/pages/projects/wikis/wikis.js +++ b/app/assets/javascripts/pages/projects/wikis/wikis.js @@ -48,7 +48,7 @@ export default class Wikis { static sidebarCanCollapse() { const bootstrapBreakpoint = bp.getBreakpointSize(); - return bootstrapBreakpoint === 'xs' || bootstrapBreakpoint === 'sm'; + return bootstrapBreakpoint === 'xs'; } renderSidebar() { diff --git a/changelogs/unreleased/48471-sidebar-on-jobs-and-wikis-is-missing-at-small-widths.yml b/changelogs/unreleased/48471-sidebar-on-jobs-and-wikis-is-missing-at-small-widths.yml new file mode 100644 index 00000000000..aaa816516c5 --- /dev/null +++ b/changelogs/unreleased/48471-sidebar-on-jobs-and-wikis-is-missing-at-small-widths.yml @@ -0,0 +1,5 @@ +--- +title: Fix sidebar collapse breapoints for job and wiki pages +merge_request: +author: +type: fixed |