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

CHANGELOG

@@ -44,6 +44,7 @@ v 7.9.0 (unreleased)
   - Wrap commit message in EmailsOnPush email.
   - Send EmailsOnPush emails when deleting commits using force push.  
   - Fix EmailsOnPush email comparison link to include first commit.
+  - Fix highliht of selected lines in file
 
 v 7.8.2
   - Fix service migration issue when upgrading from versions prior to 7.3

app/assets/javascripts/blob/blob.js.coffee

@@ -26,7 +26,7 @@ class @BlobView
       unless isNaN first_line
         $("#tree-content-holder .highlight .line").removeClass("hll")
         $("#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
     # always return first and last line (initialized to NaN)

app/assets/stylesheets/highlight/dark.scss

@@ -13,8 +13,8 @@
   }
 
   // highlight line via anchor
-  pre.hll {
-    background-color: #fff !important;
+  pre .hll {
+    background-color: #557 !important;
   }
 
   .hll { background-color: #373b41 }

app/assets/stylesheets/highlight/monokai.scss

@@ -13,7 +13,7 @@
   }
 
   // highlight line via anchor
-  pre.hll {
+  pre .hll {
     background-color: #49483e !important;
   }
 

app/assets/stylesheets/highlight/solarized_dark.scss

@@ -13,8 +13,8 @@
   }
 
   // highlight line via anchor
-  pre.hll {
-    background-color: #073642 !important;
+  pre .hll {
+    background-color: #174652 !important;
   }
 
   /* Solarized Dark

app/assets/stylesheets/highlight/solarized_light.scss

@@ -13,8 +13,8 @@
   }
 
   // highlight line via anchor
-  pre.hll {
-    background-color: #eee8d5 !important;
+  pre .hll {
+    background-color: #ddd8c5 !important;
   }
 
   /* Solarized Light

app/assets/stylesheets/highlight/white.scss

@@ -13,7 +13,7 @@
   }
 
   // highlight line via anchor
-  pre.hll {
+  pre .hll {
     background-color: #f8eec7 !important;
   }