diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-16 17:58:37 +0300 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-16 17:58:37 +0300 |
commit | 53edaa3111ff752ffc000fcca0f64595948cbeb3 (patch) | |
tree | 0650b10f69d96140d77abcb2650a26b6bf6d246b /app/assets | |
parent | 9a9d70be49eda84e17f34f22c86dd18dbb5b1eec (diff) | |
parent | b6811c060a2620757bcc75a2a85b430b95ef2532 (diff) |
Merge branch 'icon-sidebar-expanded-margin' into 'master'
Fixes icon sidebar expanding causing a jump in padding
Closes #36456
See merge request !13568
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/new_sidebar.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/new_sidebar.js b/app/assets/javascripts/new_sidebar.js index b10b074f5ac..2d1ed9e4076 100644 --- a/app/assets/javascripts/new_sidebar.js +++ b/app/assets/javascripts/new_sidebar.js @@ -43,10 +43,12 @@ export default class NewNavSidebar { } toggleCollapsedSidebar(collapsed) { - this.$sidebar.toggleClass('sidebar-icons-only', collapsed); + const breakpoint = bp.getBreakpointSize(); + if (this.$sidebar.length) { + this.$sidebar.toggleClass('sidebar-icons-only', 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); } |