Merge branch '29811-fix-line-number-alignment' into 'master'

Fix line numbers not matching up to code in code viewer. Closes #29811 See merge request !13403

Merge branch '29811-fix-line-number-alignment' into 'master'
0ff2f664 · Annabel Dunstone Gray · afd6e517 · 92ec4c7a · 0ff2f664 · 0ff2f664
Commit 0ff2f664 authored Aug 10, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

highlight.scss app/assets/stylesheets/framework/highlight.scss +1 -1

29811-fix-line-number-alignment.yml changelogs/unreleased/29811-fix-line-number-alignment.yml +5 -0

No files found.
--- a/app/assets/stylesheets/framework/highlight.scss
+++ b/app/assets/stylesheets/framework/highlight.scss
@@ -47,7 +47,7 @@
      font-family: $monospace_font;
      display: block;
      font-size: $code_font_size !important;
-      line-height: 19px;
+      min-height: 19px;
      white-space: nowrap;

      i {

--- a/changelogs/unreleased/29811-fix-line-number-alignment.yml
+++ b/changelogs/unreleased/29811-fix-line-number-alignment.yml
+---
+title: Fix the alignment of line numbers to lines of code in code viewer 
+merge_request: 13403
+author: Trevor Flynn
\ No newline at end of file