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/assets/javascripts/vue_shared | |
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/assets/javascripts/vue_shared')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/commit.vue | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_shared/components/commit.vue b/app/assets/javascripts/vue_shared/components/commit.vue index 52814de8b2d..59ca9a0a6d4 100644 --- a/app/assets/javascripts/vue_shared/components/commit.vue +++ b/app/assets/javascripts/vue_shared/components/commit.vue @@ -2,13 +2,14 @@ import commitIconSvg from 'icons/_icon_commit.svg'; import userAvatarLink from './user_avatar/user_avatar_link.vue'; import tooltip from '../directives/tooltip'; + import Icon from '../../vue_shared/components/icon.vue'; export default { props: { /** * Indicates the existance of a tag. * Used to render the correct icon, if true will render `fa-tag` icon, - * if false will render `fa-code-fork` icon. + * if false will render a svg sprite fork icon */ tag: { type: Boolean, @@ -107,6 +108,7 @@ }, components: { userAvatarLink, + Icon, }, created() { this.commitIconSvg = commitIconSvg; @@ -123,11 +125,10 @@ class="fa fa-tag" aria-hidden="true"> </i> - <i + <icon v-if="!tag" - class="fa fa-code-fork" - aria-hidden="true"> - </i> + name="fork"> + </icon> </div> <a |