diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-10 14:05:25 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-10 14:05:25 +0000 |
| commit | 0ff2f664256299e1d7da84632a58fd9c3a712612 (patch) | |
| tree | 6c18e9514676ecfbba75fa52c94c6ad2629a9baf | |
| parent | afd6e517e59aa07ab377fc29da45be08918a4f8e (diff) | |
| parent | 92ec4c7aae5cc326ee61b57d1ab4f7463f6159cb (diff) | |
| download | gitlab-ce-0ff2f664256299e1d7da84632a58fd9c3a712612.tar.gz | |
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
| -rw-r--r-- | app/assets/stylesheets/framework/highlight.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/29811-fix-line-number-alignment.yml | 4 |
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 |