Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 11 insertions, 2 deletions

diff --git a/app/assets/stylesheets/highlight/themes/solarized-dark.scss b/app/assets/stylesheets/highlight/themes/solarized-dark.scss
index acd401e1694..55d17b8f1d2 100644
--- a/app/assets/stylesheets/highlight/themes/solarized-dark.scss
+++ b/app/assets/stylesheets/highlight/themes/solarized-dark.scss
@@ -1,6 +1,7 @@
 /* https://gist.github.com/qguv/7936275 */
 
 @import '../common';
+@import 'highlight.js/styles/base16/solarized-dark.css';
 
 /*
 * Solarized dark colors
@@ -127,8 +128,12 @@ $solarized-dark-il: #2aa198;
     color: $solarized-dark-pre-color;
   }
 
-  .line_expansion {
-    @include diff-expansion($solarized-dark-line-bg, $solarized-dark-border, $solarized-dark-kd);
+  .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);
   }
 
   // Diff line
@@ -139,6 +144,10 @@ $solarized-dark-il: #2aa198;
       @include dark-diff-match-line;
     }
 
+    &.diff-grid-row {
+      @include dark-diff-expansion-line;
+    }
+
     .diff-td.diff-line-num.hll:not(.empty-cell),
     .diff-td.line-coverage.hll:not(.empty-cell),
     .diff-td.line-codequality.hll:not(.empty-cell),