Merge branch '196226-rightsidebar-collapsed-always-on-scrollbar' into 'master'

Resolve "MR right sidebar is off when scrollbars are visible"

Closes #196226

See merge request gitlab-org/gitlab!27314

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);
   }
 }
 

app/assets/stylesheets/pages/builds.scss

@@ -176,7 +176,6 @@
   }
 
   .sidebar-container {
-    width: calc(100% + 100px);
     padding-right: 100px;
     height: 100%;
     overflow-y: scroll;

app/assets/stylesheets/pages/issuable.scss

@@ -309,7 +309,6 @@
   }
 
   .issuable-sidebar {
-    width: 100%;
     height: 100%;
     overflow-y: scroll;
     overflow-x: hidden;

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;

changelogs/unreleased/196226-rightsidebar-collapsed-always-on-scrollbar.yml

+---
+title: Fix right sidebar when scrollbars are always visible
+merge_request: 27314
+author: Shawn @CasualBot
+type: fixed