summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor Flynn <tlfalaska@hotmail.com>2017-08-10 14:05:23 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-08-10 14:05:23 +0000
commit92ec4c7aae5cc326ee61b57d1ab4f7463f6159cb (patch)
tree6c18e9514676ecfbba75fa52c94c6ad2629a9baf
parentafd6e517e59aa07ab377fc29da45be08918a4f8e (diff)
downloadgitlab-ce-92ec4c7aae5cc326ee61b57d1ab4f7463f6159cb.tar.gz
Fix line numbers not matching up to code in code viewer.
-rw-r--r--app/assets/stylesheets/framework/highlight.scss2
-rw-r--r--changelogs/unreleased/29811-fix-line-number-alignment.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/highlight.scss b/app/assets/stylesheets/framework/highlight.scss
index 71d5949b023..c63114f85b4 100644
--- 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 {
diff --git a/changelogs/unreleased/29811-fix-line-number-alignment.yml b/changelogs/unreleased/29811-fix-line-number-alignment.yml
new file mode 100644
index 00000000000..94b3328a7f2
--- /dev/null
+++ b/changelogs/unreleased/29811-fix-line-number-alignment.yml
@@ -0,0 +1,4 @@
+---
+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