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/helpers | |
| 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/helpers')
| -rw-r--r-- | app/helpers/blob_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/commits_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 3c2ee2cb5bc..f9dcb32f7c4 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -269,7 +269,7 @@ module BlobHelper return if blob.empty? if blob.raw_binary? || blob.stored_externally? - icon = icon('download') + icon = sprite_icon('download') title = 'Download' else icon = icon('file-code-o') diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index 2d304f7eb91..0333c29e2fd 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -63,7 +63,7 @@ module CommitsHelper # Returns a link formatted as a commit branch link def commit_branch_link(url, text) link_to(url, class: 'label label-gray ref-name branch-link') do - icon('code-fork', class: 'append-right-5') + "#{text}" + sprite_icon('fork', size: 16, css_class: 'fork-svg') + "#{text}" end end |