diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-18 16:48:51 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-19 14:44:06 -0600 |
| commit | 1446a03e79e7ecdf09e73854062f9ca6349aad9f (patch) | |
| tree | b23a4fbe21564978d14760970c15570825929220 | |
| parent | 2bb2544ecaf37a02e4055194e90405dc1ffca094 (diff) | |
| download | gitlab-ce-25709-diff-file-overflow.tar.gz | |
Remove fixed class from file actions25709-diff-file-overflow
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 92170daa475..db1c8da06d0 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -254,7 +254,7 @@ span.idiff { margin: 0 10px 0 0; } - .file-actions-fixed { + .file-actions { white-space: nowrap; .btn { diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index 430f7878839..7ab2eb1bce9 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -3,7 +3,7 @@ = render "projects/diffs/file_header", diff_file: diff_file, blob: blob, diff_commit: diff_commit, project: project, url: "##{file_hash}" - unless diff_file.submodule? - .file-actions-fixed.hidden-xs + .file-actions.hidden-xs - if blob_text_viewable?(blob) = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip btn-file-option', title: "Toggle comments for this file", disabled: @diff_notes_disabled do = icon('comment') |