Add latest changes from gitlab-org/gitlab@master

4 files changed, 6 insertions, 4 deletions

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index bf1fd7fd29f..36f8bdbe611 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -84,6 +84,12 @@
 
 .right-sidebar {
   border-left: 1px solid $border-color;
+
+  .sidebar-container,
+  .issuable-sidebar {
+    // Add 100px so that potentially visible vertical scroll bar is hidden
+    width: calc(100% + 100px);
+  }
 }
 
 .with-performance-bar .right-sidebar.affix {
@@ -129,7 +135,6 @@
 
   .issuable-sidebar {
     padding: 0 3px;
-    width: calc(100% + 35px);
   }
 }
 
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 0ecb38a1ea7..2ddab6c3065 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -176,7 +176,6 @@
   }
 
   .sidebar-container {
-    width: calc(100% + 100px);
     padding-right: 100px;
     height: 100%;
     overflow-y: scroll;
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index fd56f655c0a..6de4dbfa8e5 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -309,7 +309,6 @@
   }
 
   .issuable-sidebar {
-    width: 100%;
     height: 100%;
     overflow-y: scroll;
     overflow-x: hidden;
diff --git a/app/assets/stylesheets/pages/wiki.scss b/app/assets/stylesheets/pages/wiki.scss
index 0b65b915abf..640968ff678 100644
--- a/app/assets/stylesheets/pages/wiki.scss
+++ b/app/assets/stylesheets/pages/wiki.scss
@@ -80,7 +80,6 @@
 
   .sidebar-container {
     padding: $gl-padding 0;
-    width: calc(100% + 100px);
     padding-right: 100px;
     height: 100%;
     overflow-y: scroll;