diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
commit | 36a59d088eca61b834191dacea009677a96c052f (patch) | |
tree | e4f33972dab5d8ef79e3944a9f403035fceea43f /app/assets/stylesheets/highlight/common.scss | |
parent | a1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff) | |
download | gitlab-ce-36a59d088eca61b834191dacea009677a96c052f.tar.gz |
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42
Diffstat (limited to 'app/assets/stylesheets/highlight/common.scss')
-rw-r--r-- | app/assets/stylesheets/highlight/common.scss | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/app/assets/stylesheets/highlight/common.scss b/app/assets/stylesheets/highlight/common.scss index bd327082e20..433141ae690 100644 --- a/app/assets/stylesheets/highlight/common.scss +++ b/app/assets/stylesheets/highlight/common.scss @@ -19,7 +19,17 @@ background: $dark-diff-match-color; } -@mixin diff-expansion($background, $border, $link) { +@mixin diff-expansion($background, $color, $hover-background, $hover-color) { + background-color: $background; + color: $color; + + &:hover { + background-color: $hover-background; + color: $hover-color; + } +} + +@mixin old-diff-expansion($background, $border, $link) { background-color: $background; .diff-td, @@ -49,6 +59,13 @@ } } + +@mixin dark-diff-expansion-line { + &.expansion .diff-td { + background-color: $dark-diff-match-color; + } +} + @mixin line-coverage-border-color($coverage, $no-coverage) { transition: border-left 0.1s ease-out; @@ -121,7 +138,8 @@ @include gl-mr-2; @include gl-w-4; @include gl-h-4; - @include gl-float-left; + @include gl-absolute; + @include gl-left-3; background-color: $color; mask-image: asset_url('icons-stacked.svg#link'); mask-repeat: no-repeat; |