diff options
author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-06-12 18:00:21 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-06-12 18:00:21 +0000 |
commit | 1b42447e26a570fad56e2da9e75df535e3f37426 (patch) | |
tree | 3b14bfd4606f01d14b6a4a0fe3214167d6d07a08 | |
parent | d78a4465fafe6f0bb5e197649a0721f35a069bbd (diff) | |
parent | 72010ed6fe314d3da806150fd09aeec829ef00ab (diff) | |
download | gitlab-ce-1b42447e26a570fad56e2da9e75df535e3f37426.tar.gz |
Merge branch '63010-visual-regression-in-12-0-line-numbers-not-lining-up-in-file-view' into 'master'
Resolve "Visual regression in 12.0: line numbers not lining up in file view"
Closes #63010
See merge request gitlab-org/gitlab-ce!29403
-rw-r--r-- | app/assets/stylesheets/framework/highlight.scss | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/highlight.scss b/app/assets/stylesheets/framework/highlight.scss index 741f92110c3..983bd032da4 100644 --- a/app/assets/stylesheets/framework/highlight.scss +++ b/app/assets/stylesheets/framework/highlight.scss @@ -11,7 +11,7 @@ border-radius: 0 0 $border-radius-default $border-radius-default; font-family: $monospace-font; font-size: $code-font-size; - line-height: 19px; + line-height: 1.5; margin: 0; overflow: auto; overflow-y: hidden; @@ -30,7 +30,7 @@ .line { display: block; width: 100%; - min-height: 19px; + min-height: 1.5em; padding-left: 10px; padding-right: 10px; white-space: pre; @@ -48,7 +48,7 @@ font-family: $monospace-font; display: block; font-size: $code-font-size !important; - min-height: 19px; + min-height: 1.5em; white-space: nowrap; i { |