From c468ad75f4dba1833b139e7949dc0fa0c75c74dc Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Tue, 21 Feb 2017 13:20:38 -0600
Subject: Keep right padding the same whether sidebar is open or not

---
 app/assets/stylesheets/framework/sidebar.scss | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index d09b1c9d7f5..040a7ce0c16 100644
--- 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;
-- 
cgit v1.2.1