Merge branch '32676-misalignment-of-line-numbers-in-code-view-on-safari' into 'master'

Properly align line numbers with code lines in Safari

See merge request gitlab-org/gitlab!24820

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,
@@ -70,6 +68,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)

changelogs/unreleased/defect-safari-line-numbers-height.yml

+---
+title: Fix code line and line number alignment in Safari
+merge_request: 24820
+author:
+type: fixed