BigW Consortium Gitlab

Commit be11f72d by Dmitriy Zaporozhets

Merge branch 'fix-line-highlight' into 'master'

Fix highlight of selected lines * show color for highlighted line * fix overflow by header See merge request !1672
parents 82bb3ec3 1178dacd
...@@ -44,6 +44,7 @@ v 7.9.0 (unreleased) ...@@ -44,6 +44,7 @@ v 7.9.0 (unreleased)
- Wrap commit message in EmailsOnPush email. - Wrap commit message in EmailsOnPush email.
- Send EmailsOnPush emails when deleting commits using force push. - Send EmailsOnPush emails when deleting commits using force push.
- Fix EmailsOnPush email comparison link to include first commit. - Fix EmailsOnPush email comparison link to include first commit.
- Fix highliht of selected lines in file
v 7.8.2 v 7.8.2
- Fix service migration issue when upgrading from versions prior to 7.3 - Fix service migration issue when upgrading from versions prior to 7.3
......
...@@ -26,7 +26,7 @@ class @BlobView ...@@ -26,7 +26,7 @@ class @BlobView
unless isNaN first_line unless isNaN first_line
$("#tree-content-holder .highlight .line").removeClass("hll") $("#tree-content-holder .highlight .line").removeClass("hll")
$("#LC#{line}").addClass("hll") for line in [first_line..last_line] $("#LC#{line}").addClass("hll") for line in [first_line..last_line]
$.scrollTo("#L#{first_line}") unless e? $.scrollTo("#L#{first_line}", offset: -50) unless e?
# parse selected lines from hash # parse selected lines from hash
# always return first and last line (initialized to NaN) # always return first and last line (initialized to NaN)
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
} }
// highlight line via anchor // highlight line via anchor
pre.hll { pre .hll {
background-color: #fff !important; background-color: #557 !important;
} }
.hll { background-color: #373b41 } .hll { background-color: #373b41 }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
} }
// highlight line via anchor // highlight line via anchor
pre.hll { pre .hll {
background-color: #49483e !important; background-color: #49483e !important;
} }
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
} }
// highlight line via anchor // highlight line via anchor
pre.hll { pre .hll {
background-color: #073642 !important; background-color: #174652 !important;
} }
/* Solarized Dark /* Solarized Dark
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
} }
// highlight line via anchor // highlight line via anchor
pre.hll { pre .hll {
background-color: #eee8d5 !important; background-color: #ddd8c5 !important;
} }
/* Solarized Light /* Solarized Light
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
} }
// highlight line via anchor // highlight line via anchor
pre.hll { pre .hll {
background-color: #f8eec7 !important; background-color: #f8eec7 !important;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment