Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 19 insertions, 4 deletions

diff --git a/app/assets/stylesheets/highlight/themes/solarized-dark.scss b/app/assets/stylesheets/highlight/themes/solarized-dark.scss
index 55d17b8f1d2..73aa6275d17 100644
--- a/app/assets/stylesheets/highlight/themes/solarized-dark.scss
+++ b/app/assets/stylesheets/highlight/themes/solarized-dark.scss
@@ -99,6 +99,25 @@ $solarized-dark-il: #2aa198;
 }
 
 .code.solarized-dark {
+  // Highlight.js theme overrides (https://gitlab.com/gitlab-org/gitlab/-/issues/365167)
+  // We should be able to remove the overrides once the upstream issue is fixed (https://github.com/sourcegraph/sourcegraph/issues/23251)
+    @include hljs-override('string', $solarized-dark-s);
+    @include hljs-override('attr', $solarized-dark-na);
+    @include hljs-override('keyword', $solarized-dark-k);
+    @include hljs-override('variable', $solarized-dark-nv);
+    @include hljs-override('variable.language_', $solarized-dark-k);
+    @include hljs-override('title', $solarized-dark-nf);
+    @include hljs-override('name', $solarized-dark-k);
+    @include hljs-override('tag', $solarized-dark-nt);
+    @include hljs-override('type', $solarized-dark-nc);
+    @include hljs-override('number', $solarized-dark-mf);
+    @include hljs-override('literal', $solarized-dark-kc);
+    @include hljs-override('built_in', $solarized-dark-n);
+    @include hljs-override('section', $solarized-dark-gh);
+    @include hljs-override('bullet', $solarized-dark-n);
+    @include hljs-override('subst', $solarized-dark-p);
+    @include hljs-override('symbol', $solarized-dark-ni);
+    
   // Line numbers
   .file-line-num {
     @include line-number-link($solarized-dark-line-color);
@@ -128,10 +147,6 @@ $solarized-dark-il: #2aa198;
     color: $solarized-dark-pre-color;
   }
 
-  .old-line_expansion {
-    @include old-diff-expansion($solarized-dark-line-bg, $solarized-dark-border, $solarized-dark-kd);
-  }
-
   .diff-line-expand-button {
     @include diff-expansion(lighten($solarized-dark-pre-bg, 10%), $gray-200, lighten($solarized-dark-pre-bg, 20%), $white);
   }