diff options
| author | Nur Rony <pro.nmrony@gmail.com> | 2017-01-30 16:58:30 +0600 |
|---|---|---|
| committer | Nur Rony <pro.nmrony@gmail.com> | 2017-01-30 16:58:30 +0600 |
| commit | 500e1a56e0a2225a61ec4bea40a474e7e3e3d1cc (patch) | |
| tree | 555063ee591321908b884ef66e1cd5474081b85e | |
| parent | b525aff665f139cd12ac5a6df78d722427e759cc (diff) | |
| download | gitlab-ce-500e1a56e0a2225a61ec4bea40a474e7e3e3d1cc.tar.gz | |
unifies mr diff file button style
| -rw-r--r-- | app/helpers/commits_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index e9461b9f859..6dcb624c4da 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -198,7 +198,7 @@ module CommitsHelper link_to( namespace_project_blob_path(project.namespace, project, tree_join(commit_sha, diff_new_path)), - class: 'btn view-file js-view-file btn-file-option' + class: 'btn view-file js-view-file' ) do raw('View file @') + content_tag(:span, commit_sha[0..6], class: 'commit-short-id') diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index c37a33bbcd5..fc478ccc995 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -5,7 +5,7 @@ - unless diff_file.submodule? .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 + = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip', title: "Toggle comments for this file", disabled: @diff_notes_disabled do = icon('comment') \ - if editable_diff?(diff_file) |