summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/job.js2
-rw-r--r--app/assets/javascripts/pages/projects/wikis/wikis.js2
-rw-r--r--changelogs/unreleased/48471-sidebar-on-jobs-and-wikis-is-missing-at-small-widths.yml5
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