diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-09-20 03:34:37 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-09-20 03:34:37 +0000 |
| commit | e15c8e8fda50f5e6f4998c525e833aa4808b31de (patch) | |
| tree | 59bae892defb0990bab1da94b8bea0d886282ad4 | |
| parent | 3be079c2eaf21efb93bcfdb80332091321b66451 (diff) | |
| parent | a027740fed115a2173d4de3fc40a32a1b2fd796e (diff) | |
| download | gitlab-ce-e15c8e8fda50f5e6f4998c525e833aa4808b31de.tar.gz | |
Merge branch 'diff-table-width-fix' into 'master'
Fixed large comments messing with diff table widths
## What does this MR do?
Fixes the width of the diff table so that the content inside it can't increase or decrease the width of the table cells.
## Screenshots (if relevant)
## What are the relevant issue numbers?
Closes #20694
See merge request !6309
| -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 d133909748b..2a827829845 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,6 +24,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 - Run CI builds with the permissions of users !5735 - Fix sorting of issues in API 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%; } |