From cadf76562a7fc7d4f341c440ce3d5e301f4c87d1 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 10 Mar 2015 10:30:07 -0700
Subject: [PATCH 1/2] Fix highlight of selected lines

---
 CHANGELOG                                             | 1 +
 app/assets/stylesheets/highlight/dark.scss            | 4 ++--
 app/assets/stylesheets/highlight/monokai.scss         | 2 +-
 app/assets/stylesheets/highlight/solarized_dark.scss  | 4 ++--
 app/assets/stylesheets/highlight/solarized_light.scss | 4 ++--
 app/assets/stylesheets/highlight/white.scss           | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9b9e583255..635546e245 100644
--- a/CHANGELOG
+++ b/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
diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss
index fcd4d47bac..df95625716 100644
--- a/app/assets/stylesheets/highlight/dark.scss
+++ b/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 }
diff --git a/app/assets/stylesheets/highlight/monokai.scss b/app/assets/stylesheets/highlight/monokai.scss
index bcd2e71665..8f6b9edc7f 100644
--- a/app/assets/stylesheets/highlight/monokai.scss
+++ b/app/assets/stylesheets/highlight/monokai.scss
@@ -13,7 +13,7 @@
   }
 
   // highlight line via anchor
-  pre.hll {
+  pre .hll {
     background-color: #49483e !important;
   }
 
diff --git a/app/assets/stylesheets/highlight/solarized_dark.scss b/app/assets/stylesheets/highlight/solarized_dark.scss
index 4a6b759bd2..97926f906e 100644
--- a/app/assets/stylesheets/highlight/solarized_dark.scss
+++ b/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
diff --git a/app/assets/stylesheets/highlight/solarized_light.scss b/app/assets/stylesheets/highlight/solarized_light.scss
index 7254f4d7ac..9398067781 100644
--- a/app/assets/stylesheets/highlight/solarized_light.scss
+++ b/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
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss
index 4d6f5dfd91..c8217d3e6b 100644
--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -13,7 +13,7 @@
   }
 
   // highlight line via anchor
-  pre.hll {
+  pre .hll {
     background-color: #f8eec7 !important;
   }
 

From 1178dacdb60e80d25700f984099dc6ce8dbf7efb Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 10 Mar 2015 10:50:53 -0700
Subject: [PATCH 2/2] Fix line highlight being hidden by header

---
 app/assets/javascripts/blob/blob.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/blob/blob.js.coffee b/app/assets/javascripts/blob/blob.js.coffee
index a5f15f80c5..37a175fdbc 100644
--- a/app/assets/javascripts/blob/blob.js.coffee
+++ b/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)