diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-09-20 12:18:20 +0200 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-09-20 12:18:20 +0200 |
| commit | 2872c75266a2cffbde77a0b8a14e22effedd00ce (patch) | |
| tree | ab5a15874f7415be8517511cf543d8c087d7f56e /app/assets/stylesheets/pages | |
| parent | 812806e6afbc92715b02d73385d820d3eabab2d1 (diff) | |
| parent | 667d2350911b2c3cca0545897eb67fda4b7d4b80 (diff) | |
| download | gitlab-ce-2872c75266a2cffbde77a0b8a14e22effedd00ce.tar.gz | |
Merge branch 'master' into merge-request-push-compare-ui
Diffstat (limited to 'app/assets/stylesheets/pages')
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 21cee2e3a70..b8ef76cc74e 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -68,6 +68,11 @@ border-collapse: separate; margin: 0; padding: 0; + table-layout: fixed; + + .diff-line-num { + width: 50px; + } .line_holder td { line-height: $code_line_height; @@ -98,10 +103,6 @@ } tr.line_holder.parallel { - .old_line, .new_line { - min-width: 50px; - } - td.line_content.parallel { width: 46%; } |