diff options
| author | Alex Hanselka <alex@gitlab.com> | 2018-12-03 23:41:26 +0300 |
|---|---|---|
| committer | Alex Hanselka <alex@gitlab.com> | 2018-12-03 23:41:26 +0300 |
| commit | 6992c6fea680b1d1118ec0fec37c0297f966ce2c (patch) | |
| tree | d868693d258d3d25896496bf49bcf3d9e8ceb0fb | |
| parent | b9f98e379008a867033691185b88052ee6a29456 (diff) | |
| parent | c3c25174e3397ca3f301b539477e6568c676d264 (diff) | |
Merge branch '11-6-stable-prepare-rc1' into '11-6-stable'
Prepare 11.6 RC1 release
See merge request gitlab-org/gitlab-ce!23517
| -rw-r--r-- | app/assets/stylesheets/framework/highlight.scss | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/54048-Line-numbers-are-misaligned-in-file-blame-view.yml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/highlight.scss b/app/assets/stylesheets/framework/highlight.scss index 452e946f95f..a0bf6907b5f 100644 --- a/app/assets/stylesheets/framework/highlight.scss +++ b/app/assets/stylesheets/framework/highlight.scss @@ -42,6 +42,7 @@ padding: 10px; text-align: right; float: left; + line-height: 1; a { font-family: $monospace-font; diff --git a/changelogs/unreleased/54048-Line-numbers-are-misaligned-in-file-blame-view.yml b/changelogs/unreleased/54048-Line-numbers-are-misaligned-in-file-blame-view.yml new file mode 100644 index 00000000000..8ceac4ec869 --- /dev/null +++ b/changelogs/unreleased/54048-Line-numbers-are-misaligned-in-file-blame-view.yml @@ -0,0 +1,5 @@ +--- +title: Fix line height of numbers in file blame view +merge_request: 23090 +author: Johann Hubert Sonntagbauer +type: fixed |