diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 09:40:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 09:40:42 +0000 |
| commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
| tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/assets/stylesheets/highlight | |
| parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) | |
| download | gitlab-ce-ee664acb356f8123f4f6b00b73c1e1cf0866c7fb.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/assets/stylesheets/highlight')
6 files changed, 16 insertions, 0 deletions
diff --git a/app/assets/stylesheets/highlight/themes/dark.scss b/app/assets/stylesheets/highlight/themes/dark.scss index 5e6e10e44be..7fb2bf9a875 100644 --- a/app/assets/stylesheets/highlight/themes/dark.scss +++ b/app/assets/stylesheets/highlight/themes/dark.scss @@ -175,6 +175,8 @@ $dark-il: #de935f; } &.diff-grid-row { + --diff-expansion-background-color: #{$gray-600}; + @include dark-diff-expansion-line; } diff --git a/app/assets/stylesheets/highlight/themes/monokai.scss b/app/assets/stylesheets/highlight/themes/monokai.scss index 19c3d6926e7..66cada9181c 100644 --- a/app/assets/stylesheets/highlight/themes/monokai.scss +++ b/app/assets/stylesheets/highlight/themes/monokai.scss @@ -168,6 +168,8 @@ $monokai-gh: #75715e; } &.diff-grid-row { + --diff-expansion-background-color: #{$gray-600}; + @include dark-diff-expansion-line; } diff --git a/app/assets/stylesheets/highlight/themes/none.scss b/app/assets/stylesheets/highlight/themes/none.scss index 4c716d20ddf..fa1f7211b3e 100644 --- a/app/assets/stylesheets/highlight/themes/none.scss +++ b/app/assets/stylesheets/highlight/themes/none.scss @@ -76,6 +76,10 @@ @include match-line; } + &.diff-grid-row { + --diff-expansion-background-color: #{$gray-100}; + } + .line-coverage { @include line-coverage-border-color($green-500, $orange-500); } diff --git a/app/assets/stylesheets/highlight/themes/solarized-dark.scss b/app/assets/stylesheets/highlight/themes/solarized-dark.scss index 70086be1606..a1bba8720a2 100644 --- a/app/assets/stylesheets/highlight/themes/solarized-dark.scss +++ b/app/assets/stylesheets/highlight/themes/solarized-dark.scss @@ -171,6 +171,8 @@ $solarized-dark-il: #2aa198; } &.diff-grid-row { + --diff-expansion-background-color: #{lighten($solarized-dark-pre-bg, 10%)}; + @include dark-diff-expansion-line; } diff --git a/app/assets/stylesheets/highlight/themes/solarized-light.scss b/app/assets/stylesheets/highlight/themes/solarized-light.scss index 8d223d1fdb1..33945f7cda9 100644 --- a/app/assets/stylesheets/highlight/themes/solarized-light.scss +++ b/app/assets/stylesheets/highlight/themes/solarized-light.scss @@ -156,6 +156,10 @@ $solarized-light-il: #2aa198; @include match-line; } + &.diff-grid-row { + --diff-expansion-background-color: #{$gray-100}; + } + &.diff-grid-row.expansion .diff-td { background-color: $solarized-light-matchline-bg; } diff --git a/app/assets/stylesheets/highlight/white_base.scss b/app/assets/stylesheets/highlight/white_base.scss index 9761e3961dd..816aa88cfde 100644 --- a/app/assets/stylesheets/highlight/white_base.scss +++ b/app/assets/stylesheets/highlight/white_base.scss @@ -154,6 +154,8 @@ pre.code, } &.diff-grid-row { + --diff-expansion-background-color: #{$gray-100}; + @include diff-match-line; } |