diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-12-22 10:59:48 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-12-22 10:59:48 +0000 |
| commit | c88594446cbafc9917290cb778cdce6d7cd330a3 (patch) | |
| tree | 94eb8925d705ffaa39ec32b65f7a0a6a03d30a20 /app/views/projects/blob | |
| parent | 692b2d7e57baf15829724165c2a58dca39db1376 (diff) | |
| parent | 5bbc322bd383adccf997b945abe7f07759b70013 (diff) | |
| download | gitlab-ce-c88594446cbafc9917290cb778cdce6d7cd330a3.tar.gz | |
Merge branch 'jivl-general-icons-2' into 'master'
Replace the download, fork and resolve discussion in a new issue icons
See merge request gitlab-org/gitlab-ce!15436
Diffstat (limited to 'app/views/projects/blob')
| -rw-r--r-- | app/views/projects/blob/_editor.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/blob/viewers/_download.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 7777f55ddd7..c9fa90acd11 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -3,7 +3,7 @@ .file-holder-bottom-radius.file-holder.file.append-bottom-default .js-file-title.file-title.clearfix{ data: { current_action: action } } .editor-ref - = icon('code-fork') + = sprite_icon('fork', size: 12) = ref %span.editor-file-name - if current_action?(:edit) || current_action?(:update) diff --git a/app/views/projects/blob/viewers/_download.html.haml b/app/views/projects/blob/viewers/_download.html.haml index 253566c43be..f9b1da05a00 100644 --- a/app/views/projects/blob/viewers/_download.html.haml +++ b/app/views/projects/blob/viewers/_download.html.haml @@ -2,6 +2,6 @@ .center.render-error.vertical-center = link_to blob_raw_path do %h1.light - = icon('download') + = sprite_icon('download') %h4 Download (#{number_to_human_size(viewer.blob.raw_size)}) |