Merge branch '39974-toggle-sidebar-btn' into 'master'

Stop toggle sidebar button from changing height on collapse Closes #39974 See merge request gitlab-org/gitlab-ce!15944

Merge branch '39974-toggle-sidebar-btn' into 'master'
307ac3a9 · Phil Hughes · 169a8c35 · ad8aff0a · 307ac3a9
Commit 307ac3a9 authored Dec 18, 2017 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

contextual-sidebar.scss app/assets/stylesheets/framework/contextual-sidebar.scss +2 -1

No files found.
--- a/app/assets/stylesheets/framework/contextual-sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual-sidebar.scss
@@ -320,13 +320,14 @@
  transition: width $sidebar-transition-duration;
  position: fixed;
  bottom: 0;
-  padding: 16px;
+  padding: $gl-padding;
  background-color: $gray-light;
  border: 0;
  border-top: 2px solid $border-color;
  color: $gl-text-color-secondary;
  display: flex;
  align-items: center;
+  line-height: 1;

  svg {
    margin-right: 8px;