diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-03-31 13:37:27 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-07 15:33:18 -0700 |
| commit | de63de18d77624d49b6a9d150f2581be0ac55e00 (patch) | |
| tree | 270213cfd032289a857d786e97a66223cee7cd0a /app/views | |
| parent | c80c1da7802c372607f5a025ef2f3e25202734c3 (diff) | |
| download | gitlab-ce-de63de18d77624d49b6a9d150f2581be0ac55e00.tar.gz | |
Update diff colors and icons
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index 698ed02ea0e..4d5461afeb7 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -29,7 +29,7 @@ .file-actions.hidden-xs - if blob_text_viewable?(blob) = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip', title: "Toggle comments for this file" do - = icon('comments') + = icon('comment') \ - if editable_diff?(diff_file) diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index a681d6dece4..5c42423541e 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -17,8 +17,8 @@ %span.note-role = access = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do - = icon('pencil-square-o') - = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete' do + = icon('pencil') + = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do = icon('trash-o') .note-body{class: note_editable?(note) ? 'js-task-list-container' : ''} .note-text |