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

3 files changed, 21 insertions, 5 deletions

diff --git a/app/assets/stylesheets/themes/_dark.scss b/app/assets/stylesheets/themes/_dark.scss
index e6e736ef47c..eeb4604f32a 100644
--- a/app/assets/stylesheets/themes/_dark.scss
+++ b/app/assets/stylesheets/themes/_dark.scss
@@ -98,6 +98,8 @@ $white-light: #2b2b2b;
 $white-normal: #333;
 $white-dark: #444;
 
+$theme-indigo-50: #1a1a40;
+
 $border-color: #4f4f4f;
 $nav-active-bg: rgba(255, 255, 255, 0.08);
 
diff --git a/app/assets/stylesheets/themes/dark_mode_overrides.scss b/app/assets/stylesheets/themes/dark_mode_overrides.scss
index 34bb4925249..92740aaf89e 100644
--- a/app/assets/stylesheets/themes/dark_mode_overrides.scss
+++ b/app/assets/stylesheets/themes/dark_mode_overrides.scss
@@ -48,6 +48,17 @@
   border-right: 1px solid $gray-50;
 }
 
+.gl-avatar:not(.gl-avatar-identicon),
+.avatar-container,
+.avatar {
+  background: rgba($gray-950, 0.04);
+}
+
+.gl-avatar {
+  @include gl-border-none;
+  box-shadow: inset 0 0 0 1px rgba($gray-950, $gl-avatar-border-opacity);
+}
+
 .nav-sidebar {
   li {
     a {
@@ -149,3 +160,8 @@ body.gl-dark {
     background-color: $gray-200;
   }
 }
+
+.timeline-entry.internal-note:not(.note-form) {
+  // soften on darkmode
+  background-color: mix($gray-50, $orange-50, 75%);
+}
diff --git a/app/assets/stylesheets/themes/theme_helper.scss b/app/assets/stylesheets/themes/theme_helper.scss
index 2b6221a6c87..042e21cebd6 100644
--- a/app/assets/stylesheets/themes/theme_helper.scss
+++ b/app/assets/stylesheets/themes/theme_helper.scss
@@ -176,11 +176,9 @@
       }
     }
 
-    &.is-not-active {
-      .keyboard-shortcut-helper {
-        color: $search-and-nav-links;
-        background-color: rgba($search-and-nav-links, 0.2);
-      }
+    .keyboard-shortcut-helper {
+      color: $search-and-nav-links;
+      background-color: rgba($search-and-nav-links, 0.2);
     }
   }