Add latest changes from gitlab-org/gitlab@master

3 files changed, 23 insertions, 13 deletions

diff --git a/app/assets/stylesheets/_page_specific_files.scss b/app/assets/stylesheets/_page_specific_files.scss
index 1cb90e849ab..620a8654d4e 100644
--- a/app/assets/stylesheets/_page_specific_files.scss
+++ b/app/assets/stylesheets/_page_specific_files.scss
@@ -12,7 +12,6 @@
 @import './pages/diff';
 @import './pages/editor';
 @import './pages/environment_logs';
-@import './pages/error_details';
 @import './pages/error_list';
 @import './pages/error_tracking_list';
 @import './pages/events';
diff --git a/app/assets/stylesheets/framework/contextual_sidebar.scss b/app/assets/stylesheets/framework/contextual_sidebar.scss
index 7004bcc121d..48252762546 100644
--- a/app/assets/stylesheets/framework/contextual_sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual_sidebar.scss
@@ -363,20 +363,30 @@
 // Collapsed nav
 
 .toggle-sidebar-button,
-.close-nav-button {
-  width: $contextual-sidebar-width - 1px;
+.close-nav-button,
+.toggle-right-sidebar-button {
   transition: width $sidebar-transition-duration;
-  position: fixed;
   height: $toggle-sidebar-height;
-  bottom: 0;
   padding: 0 $gl-padding;
   background-color: $gray-light;
   border: 0;
-  border-top: 1px solid $border-color;
   color: $gl-text-color-secondary;
   display: flex;
   align-items: center;
 
+  &:hover {
+    background-color: $border-color;
+    color: $gl-text-color;
+  }
+}
+
+.toggle-sidebar-button,
+.close-nav-button {
+  position: fixed;
+  bottom: 0;
+  width: $contextual-sidebar-width - 1px;
+  border-top: 1px solid $border-color;
+
   svg {
     margin-right: 8px;
   }
@@ -384,11 +394,10 @@
   .icon-chevron-double-lg-right {
     display: none;
   }
+}
 
-  &:hover {
-    background-color: $border-color;
-    color: $gl-text-color;
-  }
+.toggle-right-sidebar-button {
+  border-bottom: 1px solid $border-color;
 }
 
 .collapse-text {
diff --git a/app/assets/stylesheets/pages/error_details.scss b/app/assets/stylesheets/page_bundles/error_tracking_details.scss
index 78cac12d6be..a47c5cc9b3e 100644
--- a/app/assets/stylesheets/pages/error_details.scss
+++ b/app/assets/stylesheets/page_bundles/error_tracking_details.scss
@@ -1,15 +1,17 @@
+@import 'page_bundles/mixins_and_variables_and_functions';
+
 .error-details {
   li {
     @include gl-line-height-32;
   }
 
   .btn-outline-info {
-    color: $blue-500;
-    border-color: $blue-500;
+    color: var(--blue-500, $blue-500);
+    border-color: var(--blue-500, $blue-500);
   }
 
   .error-details-header {
-    border-bottom: 1px solid $border-color;
+    border-bottom: 1px solid var(--border-color, $border-color);
 
     @include media-breakpoint-down(xs) {
       flex-flow: column;