diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-17 21:02:08 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-17 21:02:08 +0000 |
| commit | 1b284a52e05d86718b794eee02aae9e841175ac9 (patch) | |
| tree | 0dcf0f62780d5c7e4721e9851f3f29de357e1691 /app | |
| parent | da57eb39cd2e5d8dd92b05d16f49681f1677f3e8 (diff) | |
| parent | 7aa7dad4a1bd839a5eecdbe892c7d81a5e5ab357 (diff) | |
| download | gitlab-ce-1b284a52e05d86718b794eee02aae9e841175ac9.tar.gz | |
Merge branch 'cs-fix-firefox-height' into 'master'
Fix line numbers not matching up with code in Firefox.
Firefox has had broken line number alignment for a while now, if this is a bug with Firefox they don't seem to want to fix it since its been there from 46 through 49. This fixes it.
Before:
After:
Fixes #20202.
Safari/Chrome work the same as before, Snippets seems to work fine still as well.
Page tested: http://localhost:3000/gitlab-org/gitlab-ce/blob/master/app/models/project.rb
cc: @annabeldunstone
See merge request !6485
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/highlight.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/highlight.scss b/app/assets/stylesheets/framework/highlight.scss index 07c8874bf03..909a0f4afda 100644 --- a/app/assets/stylesheets/framework/highlight.scss +++ b/app/assets/stylesheets/framework/highlight.scss @@ -11,7 +11,7 @@ border-radius: 0; font-family: $monospace_font; font-size: $code_font_size; - line-height: $code_line_height !important; + line-height: 19px; margin: 0; overflow: auto; overflow-y: hidden; @@ -47,7 +47,7 @@ font-family: $monospace_font; display: block; font-size: $code_font_size !important; - line-height: $code_line_height !important; + line-height: 19px; white-space: nowrap; i { |