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

1 files changed, 16 insertions, 15 deletions

diff --git a/app/assets/stylesheets/highlight/common.scss b/app/assets/stylesheets/highlight/common.scss
index fcbd05141b9..96df8487c0e 100644
--- a/app/assets/stylesheets/highlight/common.scss
+++ b/app/assets/stylesheets/highlight/common.scss
@@ -98,32 +98,33 @@
   }
 }
 
-@mixin line-number-link($color) {
-  min-width: $gl-spacing-scale-9;
 
+@mixin line-link($color, $icon) {
   &::before {
-    @include gl-display-none;
+    @include gl-visibility-hidden;
     @include gl-align-self-center;
-    @include gl-mt-2;
-    @include gl-mr-2;
-    @include gl-w-4;
-    @include gl-h-4;
-    @include gl-absolute;
-    @include gl-left-3;
-    background-color: $color;
-    mask-image: asset_url('icons-stacked.svg#link');
+    @include gl-mr-1;
+    @include gl-w-5;
+    @include gl-h-5;
+    background-color: rgba($color, 0.3);
+    mask-image: asset_url('icons-stacked.svg##{$icon}');
     mask-repeat: no-repeat;
     mask-size: cover;
     mask-position: center;
     content: '';
   }
 
-  &:hover::before {
-    @include gl-display-inline-block;
+  &:hover {
+    &::before {
+      background-color: rgba($color, 0.6);
+    }
   }
+}
 
-  &:focus::before {
-    @include gl-display-inline-block;
+@mixin line-hover-bg($color: $white-normal) {
+  &:hover,
+  &:focus-within {
+    background-color: darken($color, 10);
   }
 }