diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-09-20 03:34:37 +0000 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-20 11:09:39 -0500 |
commit | 7706164e45f0cd221738d32ffb0e5c7e4829c945 (patch) | |
tree | 5b7fcde1e66f624e3a9f1dbb4ec9c8261e92341f | |
parent | 2f5973861a01e40df715e0a4bc28de7235034121 (diff) | |
download | gitlab-ce-7706164e45f0cd221738d32ffb0e5c7e4829c945.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)
![Screen_Shot_2016-09-12_at_14.44.44](/uploads/2ca483399d867153e6ae608360ffea5f/Screen_Shot_2016-09-12_at_14.44.44.png)
## 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 f7141279ef9..981dd7d3cf5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -25,6 +25,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%; } |