From 3db0b2f10718e5cb37e564a9eb17241d7838bdb6 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Thu, 13 Feb 2020 13:25:38 -0700
Subject: [PATCH 1/2] Reset line numbers and file lines to a base-linked height

---
 app/assets/stylesheets/framework/highlight.scss | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/framework/highlight.scss b/app/assets/stylesheets/framework/highlight.scss
index ee6e53adaf7f0b..a4594cc482701a 100644
--- a/app/assets/stylesheets/framework/highlight.scss
+++ b/app/assets/stylesheets/framework/highlight.scss
@@ -30,7 +30,6 @@
       .line {
         display: block;
         width: 100%;
-        min-height: 1.5em;
         padding-left: 10px;
         padding-right: 10px;
         white-space: pre;
@@ -48,7 +47,6 @@
       font-family: $monospace-font;
       display: block;
       font-size: $code-font-size !important;
-      min-height: 1.5em;
       white-space: nowrap;
 
       i {
@@ -68,6 +66,13 @@
       }
     }
   }
+
+  pre .line,
+  .line-numbers a {
+    font-size: 0.8125rem;
+    line-height: 1.1875rem;
+    min-height: 1.1875rem;
+  }
 }
 
 // Vertically aligns <table> line numbers (eg. blame view)
-- 
GitLab


From 8e568ef51ef83b104b95c8291c25d6ae36fa7542 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Thu, 13 Feb 2020 12:42:28 -0700
Subject: [PATCH 2/2] Add change log

---
 changelogs/unreleased/defect-safari-line-numbers-height.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelogs/unreleased/defect-safari-line-numbers-height.yml

diff --git a/changelogs/unreleased/defect-safari-line-numbers-height.yml b/changelogs/unreleased/defect-safari-line-numbers-height.yml
new file mode 100644
index 00000000000000..e72a7ffc107715
--- /dev/null
+++ b/changelogs/unreleased/defect-safari-line-numbers-height.yml
@@ -0,0 +1,5 @@
+---
+title: Fix code line and line number alignment in Safari
+merge_request: 24820
+author:
+type: fixed
-- 
GitLab