Merge branch '28610-white-square-nav' into 'master'

Fix white square and sidebar animation

Closes #28610

See merge request !9472

1 files changed, 10 insertions, 6 deletions

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 040a7ce0c16..8978e284f55 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -29,16 +29,14 @@
   }
 }
 
-@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;
     }
@@ -56,6 +54,12 @@
 .right-sidebar-expanded {
   padding-right: 0;
 
+  @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+    .content-wrapper {
+      padding-right: $gutter_collapsed_width;
+    }
+  }
+
   @media (min-width: $screen-md-min) {
     .content-wrapper {
       padding-right: $gutter_width;