Commit 53edaa31 authored by Clement Ho's avatar Clement Ho

Merge branch 'icon-sidebar-expanded-margin' into 'master'

Fixes icon sidebar expanding causing a jump in padding

Closes #36456

See merge request !13568
parents 9a9d70be b6811c06
...@@ -43,10 +43,12 @@ export default class NewNavSidebar { ...@@ -43,10 +43,12 @@ export default class NewNavSidebar {
} }
toggleCollapsedSidebar(collapsed) { toggleCollapsedSidebar(collapsed) {
this.$sidebar.toggleClass('sidebar-icons-only', collapsed); const breakpoint = bp.getBreakpointSize();
if (this.$sidebar.length) { if (this.$sidebar.length) {
this.$sidebar.toggleClass('sidebar-icons-only', collapsed);
this.$page.toggleClass('page-with-new-sidebar', !collapsed); this.$page.toggleClass('page-with-new-sidebar', !collapsed);
this.$page.toggleClass('page-with-icon-sidebar', collapsed); this.$page.toggleClass('page-with-icon-sidebar', breakpoint === 'sm' ? true : collapsed);
} }
NewNavSidebar.setCollapsedCookie(collapsed); NewNavSidebar.setCollapsedCookie(collapsed);
} }
......
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