From df1975e383d776b21fc385e190a5124ee2a7cbb5 Mon Sep 17 00:00:00 2001
From: Jimmy Praet <jimmy.praet@telenet.be>
Date: Sun, 27 Jun 2021 13:14:31 +0200
Subject: [PATCH 1/2] Add scroll-margin-top to account for sticky header

---
 web_src/js/index.js       |  2 +-
 web_src/less/_review.less | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/web_src/js/index.js b/web_src/js/index.js
index c00b3aaeb076c..67548f5d9d82d 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -1343,7 +1343,7 @@ function initPullRequestReview() {
         $(`#code-comments-${id}`).removeClass('hide');
         $(`#code-preview-${id}`).removeClass('hide');
         $(`#hide-outdated-${id}`).removeClass('hide');
-        $(window).scrollTop(commentDiv.offset().top);
+        commentDiv[0].scrollIntoView();
       }
     }
   }
diff --git a/web_src/less/_review.less b/web_src/less/_review.less
index 9197050913404..413f83b639c44 100644
--- a/web_src/less/_review.less
+++ b/web_src/less/_review.less
@@ -173,3 +173,15 @@ a.blob-excerpt:hover {
 .review-box > .segment {
   border: none !important;
 }
+
+.pull.files.diff [id] {
+  scroll-margin-top: 99px;
+
+  @media @mediaMd {
+    scroll-margin-top: 130px;
+  }
+
+  @media @mediaSm {
+    scroll-margin-top: 130px;
+  }
+}

From 9874e55e886133dc19859885664523a79c26f5d3 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Sun, 27 Jun 2021 13:44:26 +0100
Subject: [PATCH 2/2] Apply suggestions from code review

---
 web_src/less/_review.less | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/web_src/less/_review.less b/web_src/less/_review.less
index 413f83b639c44..2b15eec82d7c7 100644
--- a/web_src/less/_review.less
+++ b/web_src/less/_review.less
@@ -177,11 +177,7 @@ a.blob-excerpt:hover {
 .pull.files.diff [id] {
   scroll-margin-top: 99px;
 
-  @media @mediaMd {
-    scroll-margin-top: 130px;
-  }
-
-  @media @mediaSm {
+  @media @mediaMdAndDown {
     scroll-margin-top: 130px;
   }
 }