diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-14 20:52:11 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-14 20:52:11 +0000 |
| commit | 88f02b0f04e97de864dd9c152e4a41ab8683f5da (patch) | |
| tree | 6b4abb54ca62c5c4343a660e9739e2f9c9fa3b8a | |
| parent | a3b74f1a1a97624ed0b9f2be14ff16a82cbd2cd0 (diff) | |
| parent | eed4439e2006a8738b7dbf11a96dd709eaf423eb (diff) | |
| download | gitlab-ce-88f02b0f04e97de864dd9c152e4a41ab8683f5da.tar.gz | |
Merge branch 'changes-overflow-fix' into 'master'
Fixed overflow issue in changes dropdown
See merge request gitlab-org/gitlab-ce!14181
| -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} |