summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/highlight/common.scss
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/highlight/common.scss')
-rw-r--r--app/assets/stylesheets/highlight/common.scss11
1 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/stylesheets/highlight/common.scss b/app/assets/stylesheets/highlight/common.scss
index 96df8487c0e..085e25a0cdc 100644
--- a/app/assets/stylesheets/highlight/common.scss
+++ b/app/assets/stylesheets/highlight/common.scss
@@ -57,6 +57,15 @@
}
}
+@mixin line-number-hover-dark {
+ background-color: $purple-800;
+ border-color: $purple-300;
+
+ a {
+ color: $purple-50;
+ }
+}
+
@mixin conflict-colors($theme) {
.diff-line-num {
&.conflict_marker_our,
@@ -75,6 +84,8 @@
.line_holder {
.line_content,
.line-coverage {
+ position: relative;
+
&.conflict_marker_our {
background-color: map-get($conflict-colors, #{$theme}-header-head-neutral);
border-color: map-get($conflict-colors, #{$theme}-header-head-neutral);