diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-11 13:00:55 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-09-13 14:29:52 +0100 |
| commit | eed4439e2006a8738b7dbf11a96dd709eaf423eb (patch) | |
| tree | ad5f409ed8561012c1e967eba36889860e05a64f | |
| parent | 7bd66b7612dde47a85ca19d478fdd32810eb55de (diff) | |
| download | gitlab-ce-changes-overflow-fix.tar.gz | |
Fixed overflow issue in changes dropdownchanges-overflow-fix
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 10 | ||||
| -rw-r--r-- | app/views/projects/diffs/_stats.html.haml | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 54c3c0173ae..951580ea1fe 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -634,8 +634,16 @@ padding-top: 8px; padding-bottom: 8px; } + + .diff-changed-file { + display: flex; + align-items: center; + } } .diff-file-changes-path { - @include str-truncated(78%); + flex: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } diff --git a/app/views/projects/diffs/_stats.html.haml b/app/views/projects/diffs/_stats.html.haml index ad2d355ab4a..2de2cf9e38c 100644 --- a/app/views/projects/diffs/_stats.html.haml +++ b/app/views/projects/diffs/_stats.html.haml @@ -21,9 +21,9 @@ %ul - diff_files.each do |diff_file| %li - %a{ href: "##{hexdigest(diff_file.file_path)}", title: diff_file.new_path } + %a.diff-changed-file{ href: "##{hexdigest(diff_file.file_path)}", title: diff_file.new_path } = icon("#{diff_file_changed_icon(diff_file)} fw", class: "#{diff_file_changed_icon_color(diff_file)} append-right-5") - %span.diff-file-changes-path= diff_file.new_path + %span.diff-file-changes-path.append-right-5= diff_file.new_path .pull-right %span.cgreen< +#{diff_file.added_lines} |