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

Fixes icon sidebar expanding causing a jump in padding Closes #36456 See merge request !13568

Merge branch 'icon-sidebar-expanded-margin' into 'master'
53edaa31 · Clement Ho · 9a9d70be · b6811c06 · 53edaa31
Commit 53edaa31 authored Aug 16, 2017 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

new_sidebar.js app/assets/javascripts/new_sidebar.js +4 -2

No files found.
--- 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);
  }