Merge branch '28495-content-shifting' into 'master'

Keep right padding the same whether sidebar is open or not Closes #28495 See merge request !9422

Merge branch '28495-content-shifting' into 'master'
f106ad51 · Filipa Lacerda · 176cd2ba · c468ad75 · f106ad51
Commit f106ad51 authored Feb 23, 2017 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 10 deletions

sidebar.scss app/assets/stylesheets/framework/sidebar.scss +6 -10

No files found.
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -29,14 +29,16 @@
  }
 }

+@media (min-width: $screen-sm-min) {
+  .content-wrapper {
+    padding-right: $gutter_collapsed_width;
+  }
+}
+
 .right-sidebar-collapsed {
  padding-right: 0;

  @media (min-width: $screen-sm-min) {
-    .content-wrapper {
-      padding-right: $gutter_collapsed_width;
-    }
-
    .merge-request-tabs-holder.affix {
      right: $gutter_collapsed_width;
    }
@@ -54,12 +56,6 @@
 .right-sidebar-expanded {
  padding-right: 0;

-  @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
-    &:not(.build-sidebar):not(.wiki-sidebar) {
-      padding-right: $gutter_collapsed_width;
-    }
-  }
-
  @media (min-width: $screen-md-min) {
    .content-wrapper {
      padding-right: $gutter_width;