diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-12 14:44:16 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-12 14:44:16 +0100 |
| commit | a027740fed115a2173d4de3fc40a32a1b2fd796e (patch) | |
| tree | 7b885e545cf4315a3d7b05c715904f8f06667762 | |
| parent | 45afdbef0de58f6de207b057e47151611d2ad7e6 (diff) | |
| download | gitlab-ce-diff-table-width-fix.tar.gz | |
Fixed large comments messing with diff table widthsdiff-table-width-fix
Closes #20694
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 132122d460d..d733bdb3858 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ v 8.12.0 (unreleased) - Change logo animation to CSS (ClemMakesApps) - Instructions for enabling Git packfile bitmaps !6104 - Use Search::GlobalService.new in the `GET /projects/search/:query` endpoint + - Fix long comments in diffs messing with table width - Fix pagination on user snippets page - Fix sorting of issues in API - Escape search term before passing it to Regexp.new !6241 (winniehell) 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%; } |