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

Keep right padding the same whether sidebar is open or not

Closes #28495

See merge request !9422

app/assets/stylesheets/framework/sidebar.scss

@@ -29,14 +29,16 @@
   }
 }
 
-.right-sidebar-collapsed {
-  padding-right: 0;
-
-  @media (min-width: $screen-sm-min) {
+@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) {
     .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;