Merge branch 'stop-jumping' into 'master'

stop jumping all content on collapsing and expanding the sidebar

When you collapse or expand the sidebar, all content shifts with 5px.

This merge request solves that.

cc @darby

See merge request !1877

app/assets/stylesheets/generic/sidebar.scss

@@ -16,7 +16,7 @@
 
 .content-wrapper {
   width: 100%;
-  padding: 15px;
+  padding: 20px;
   background: #FFF;
 }
 
@@ -96,10 +96,6 @@
       width: 230px;
     }
   }
-
-  .content-wrapper {
-    padding: 20px;
-  }
 }
 
 @mixin folded-sidebar {