Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 2 insertions, 12 deletions

diff --git a/app/assets/stylesheets/framework/contextual_sidebar.scss b/app/assets/stylesheets/framework/contextual_sidebar.scss
index 036cec15935..ad0036df607 100644
--- a/app/assets/stylesheets/framework/contextual_sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual_sidebar.scss
@@ -134,16 +134,6 @@
   .avatar-container {
     @include gl-font-weight-normal;
     flex: none;
-    box-shadow: $avatar-box-shadow;
-
-    &.rect-avatar {
-      @include gl-border-none;
-
-      .avatar.s32 {
-        border-radius: $border-radius-default;
-        box-shadow: $avatar-box-shadow;
-      }
-    }
   }
 }
 
@@ -214,7 +204,7 @@
 //
 
 .page-with-contextual-sidebar {
-  transition: padding-left $sidebar-transition-duration;
+  transition: padding-left $gl-transition-duration-medium;
 
   @include media-breakpoint-up(md) {
     padding-left: $contextual-sidebar-collapsed-width;
@@ -243,7 +233,7 @@
   @include gl-fixed;
   @include gl-bottom-0;
   @include gl-left-0;
-  transition: width $sidebar-transition-duration, left $sidebar-transition-duration;
+  transition: width $gl-transition-duration-medium, left $gl-transition-duration-medium;
   z-index: 600;
   width: $contextual-sidebar-width;
   top: $header-height;